Skip to content

Commit ad4c3d8

Browse files
committed
(DO NOT MERGE) Is this hack even needed for the problem it exists to work around?
1 parent de19f2b commit ad4c3d8

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

src/tools/compiletest/src/runtest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ impl<'test> TestCx<'test> {
17821782

17831783
fn get_output_file(&self, extension: &str) -> TargetLocation {
17841784
let thin_lto = self.props.compile_flags.iter().any(|s| s.ends_with("lto=thin"));
1785-
if thin_lto {
1785+
if false && thin_lto {
17861786
TargetLocation::ThisDirectory(self.output_base_dir())
17871787
} else {
17881788
// This works with both `--emit asm` (as default output name for the assembly)
@@ -1795,7 +1795,7 @@ impl<'test> TestCx<'test> {
17951795

17961796
fn get_filecheck_file(&self, extension: &str) -> PathBuf {
17971797
let thin_lto = self.props.compile_flags.iter().any(|s| s.ends_with("lto=thin"));
1798-
if thin_lto {
1798+
if false && thin_lto {
17991799
let name = self.testpaths.file.file_stem().unwrap().to_str().unwrap();
18001800
let canonical_name = name.replace('-', "_");
18011801
let mut output_file = None;

tests/assembly/thin-lto.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
22
//@ only-x86_64-unknown-linux-gnu
33
//@ assembly-output: emit-asm
4+
//@ ignore-test
45

56
// CHECK: main
67

tests/codegen/issues/issue-81408-dllimport-thinlto-windows.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
2-
//@ only-windows
32
//@ aux-build:static_dllimport_aux.rs
43

54
// Test that on Windows, when performing ThinLTO, we do not mark cross-crate static items with

tests/codegen/thin-lto.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
22
//@ only-x86_64-unknown-linux-gnu
3+
//@ ignore-test
34

45
// CHECK: main
56

tests/coverage/thin-lto.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
//@ compile-flags: -O -C lto=thin -C prefer-dynamic=no
2+
//@ ignore-test
23

34
pub fn main() {}

0 commit comments

Comments
 (0)