From c27a82f19352f37a6b04d7733d28c84494c3afd4 Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Sat, 30 Sep 2017 16:28:48 +1000 Subject: Don't use remapped path when loading modules and include files --- src/test/codegen/remap_path_prefix/aux_mod.rs | 16 ++++++++++++++++ src/test/codegen/remap_path_prefix/main.rs | 7 +++++++ 2 files changed, 23 insertions(+) create mode 100644 src/test/codegen/remap_path_prefix/aux_mod.rs (limited to 'src/test/codegen') diff --git a/src/test/codegen/remap_path_prefix/aux_mod.rs b/src/test/codegen/remap_path_prefix/aux_mod.rs new file mode 100644 index 00000000000..2a7019957af --- /dev/null +++ b/src/test/codegen/remap_path_prefix/aux_mod.rs @@ -0,0 +1,16 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ignore-test: this is not a test + +#[inline] +pub fn some_aux_mod_function() -> i32 { + 1234 +} diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs index eb00c91ba5f..c73739bb765 100644 --- a/src/test/codegen/remap_path_prefix/main.rs +++ b/src/test/codegen/remap_path_prefix/main.rs @@ -16,12 +16,19 @@ extern crate remap_path_prefix_aux; +// Here we check that submodules and include files are found using the path without +// remapping. This test requires that rustc is called with an absolute path. +mod aux_mod; +include!("aux_mod.rs"); + // Here we check that the expansion of the file!() macro is mapped. // CHECK: internal constant [34 x i8] c"/the/src/remap_path_prefix/main.rs" pub static FILE_PATH: &'static str = file!(); fn main() { remap_path_prefix_aux::some_aux_function(); + aux_mod::some_aux_mod_function(); + some_aux_mod_function(); } // Here we check that local debuginfo is mapped correctly. -- cgit 1.4.1-3-g733a5