From 5c62ce4a8246e244620d1ff72e657bdea0cd5d4a Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Wed, 26 Apr 2017 12:46:09 +0200 Subject: Make codegen test for remap-path-prefix more thorough. --- src/test/codegen/remap_path_prefix.rs | 19 -------------- .../auxiliary/remap_path_prefix_aux.rs | 18 +++++++++++++ src/test/codegen/remap_path_prefix/main.rs | 30 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 src/test/codegen/remap_path_prefix.rs create mode 100644 src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs create mode 100644 src/test/codegen/remap_path_prefix/main.rs (limited to 'src/test/codegen') diff --git a/src/test/codegen/remap_path_prefix.rs b/src/test/codegen/remap_path_prefix.rs deleted file mode 100644 index 98e8180ed38..00000000000 --- a/src/test/codegen/remap_path_prefix.rs +++ /dev/null @@ -1,19 +0,0 @@ -// 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-tidy-linelength - -// compile-flags: -g -Zremap-path-prefix-from={{cwd}} -Zremap-path-prefix-to=/the/cwd -Zremap-path-prefix-from={{src-base}} -Zremap-path-prefix-to=/the/src - -// CHECK: !DIFile(filename: "/the/src/remap_path_prefix.rs", directory: "/the/cwd") - -fn main() { - // We just check that the DIFile got remapped properly. -} diff --git a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs b/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs new file mode 100644 index 00000000000..5543a091680 --- /dev/null +++ b/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs @@ -0,0 +1,18 @@ +// 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-tidy-linelength + +// compile-flags: -g -Zremap-path-prefix-from={{cwd}} -Zremap-path-prefix-to=/the/aux-cwd -Zremap-path-prefix-from={{src-base}}/remap_path_prefix/auxiliary -Zremap-path-prefix-to=/the/aux-src + +#[inline] +pub fn some_aux_function() -> i32 { + 1234 +} diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs new file mode 100644 index 00000000000..26e4f04e1b8 --- /dev/null +++ b/src/test/codegen/remap_path_prefix/main.rs @@ -0,0 +1,30 @@ +// 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-tidy-linelength + +// compile-flags: -g -C no-prepopulate-passes -Zremap-path-prefix-from={{cwd}} -Zremap-path-prefix-to=/the/cwd -Zremap-path-prefix-from={{src-base}} -Zremap-path-prefix-to=/the/src +// aux-build:remap_path_prefix_aux.rs + +extern crate remap_path_prefix_aux; + +// 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(); +} + +// Here we check that local debuginfo is mapped correctly. +// CHECK: !DIFile(filename: "/the/src/remap_path_prefix/main.rs", directory: "/the/cwd") + +// And here that debuginfo from other crates are expanded to absolute paths. +// CHECK: !DIFile(filename: "/the/aux-src/remap_path_prefix_aux.rs", directory: "") -- cgit 1.4.1-3-g733a5