Skip to content

Commit 9090ed8

Browse files
committed
Fix test on targets with crt-static default
1 parent 34c248d commit 9090ed8

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

Diff for: tests/codegen/sanitizer/address-sanitizer-globals-tracking.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
// only-linux
2020
//
2121
// revisions:ASAN ASAN-FAT-LTO
22-
//[ASAN] compile-flags: -Zsanitizer=address
23-
//[ASAN-FAT-LTO] compile-flags: -Zsanitizer=address -Cprefer-dynamic=false -Clto=fat
22+
// compile-flags: -Zsanitizer=address -Ctarget-feature=-crt-static
23+
//[ASAN] compile-flags:
24+
//[ASAN-FAT-LTO] compile-flags: -Cprefer-dynamic=false -Clto=fat
2425

2526
#![crate_type="staticlib"]
2627

Diff for: tests/codegen/sanitizer/memory-track-origins.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
// needs-sanitizer-memory
55
// revisions:MSAN-0 MSAN-1 MSAN-2 MSAN-1-LTO MSAN-2-LTO
66
//
7-
//[MSAN-0] compile-flags: -Zsanitizer=memory
8-
//[MSAN-1] compile-flags: -Zsanitizer=memory -Zsanitizer-memory-track-origins=1
9-
//[MSAN-2] compile-flags: -Zsanitizer=memory -Zsanitizer-memory-track-origins
10-
//[MSAN-1-LTO] compile-flags: -Zsanitizer=memory -Zsanitizer-memory-track-origins=1 -C lto=fat
11-
//[MSAN-2-LTO] compile-flags: -Zsanitizer=memory -Zsanitizer-memory-track-origins -C lto=fat
7+
// compile-flags: -Zsanitizer=memory -Ctarget-feature=-crt-static
8+
//[MSAN-0] compile-flags:
9+
//[MSAN-1] compile-flags: -Zsanitizer-memory-track-origins=1
10+
//[MSAN-2] compile-flags: -Zsanitizer-memory-track-origins
11+
//[MSAN-1-LTO] compile-flags: -Zsanitizer-memory-track-origins=1 -C lto=fat
12+
//[MSAN-2-LTO] compile-flags: -Zsanitizer-memory-track-origins -C lto=fat
1213

1314
#![crate_type="lib"]
1415

Diff for: tests/codegen/sanitizer/no-sanitize-inlining.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
// needs-sanitizer-address
55
// needs-sanitizer-leak
66
// revisions: ASAN LSAN
7-
//[ASAN] compile-flags: -Zsanitizer=address -C opt-level=3 -Z mir-opt-level=4
8-
//[LSAN] compile-flags: -Zsanitizer=leak -C opt-level=3 -Z mir-opt-level=4
7+
// compile-flags: -Copt-level=3 -Zmir-opt-level=4 -Ctarget-feature=-crt-static
8+
//[ASAN] compile-flags: -Zsanitizer=address
9+
//[LSAN] compile-flags: -Zsanitizer=leak
910

1011
#![crate_type="lib"]
1112
#![feature(no_sanitize)]

Diff for: tests/codegen/sanitizer/no-sanitize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// selectively disable sanitizer instrumentation.
33
//
44
// needs-sanitizer-address
5-
// compile-flags: -Zsanitizer=address
5+
// compile-flags: -Zsanitizer=address -Ctarget-feature=-crt-static
66

77
#![crate_type="lib"]
88
#![feature(no_sanitize)]

Diff for: tests/codegen/sanitizer/sanitizer-recover.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// revisions:ASAN ASAN-RECOVER MSAN MSAN-RECOVER MSAN-RECOVER-LTO
77
// no-prefer-dynamic
88
//
9+
// compile-flags: -Ctarget-feature=-crt-static
910
//[ASAN] compile-flags: -Zsanitizer=address -Copt-level=0
1011
//[ASAN-RECOVER] compile-flags: -Zsanitizer=address -Zsanitizer-recover=address -Copt-level=0
1112
//[MSAN] compile-flags: -Zsanitizer=memory

Diff for: tests/ui/sanitize/cfg.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33

44
// check-pass
55
// revisions: address cfi kcfi leak memory thread
6+
//compile-flags: -Ctarget-feature=-crt-static
67
//[address]needs-sanitizer-address
78
//[address]compile-flags: -Zsanitizer=address --cfg address
89
//[cfi]needs-sanitizer-cfi
910
//[cfi]compile-flags: -Zsanitizer=cfi --cfg cfi
10-
//[cfi]compile-flags: -Clto -Ccodegen-units=1 -Ctarget-feature=-crt-static
11+
//[cfi]compile-flags: -Clto -Ccodegen-units=1
1112
//[kcfi]needs-llvm-components: x86
1213
//[kcfi]compile-flags: -Zsanitizer=kcfi --cfg kcfi --target x86_64-unknown-none
1314
//[leak]needs-sanitizer-leak

0 commit comments

Comments
 (0)