Skip to content

Commit ff976fe

Browse files
Fix ignore-logic for sanitizer run-make tests.
1 parent cc77087 commit ff976fe

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Diff for: src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# needs-sanitizer-support
2+
# only-x86_64
3+
# only-linux
24

35
-include ../tools.mk
46

@@ -9,11 +11,8 @@ LOG := $(TMPDIR)/log.txt
911
# are compiled with address sanitizer, and we assert that a fault in the cdylib
1012
# is correctly detected.
1113

12-
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
13-
1414
# See comment in sanitizer-address/Makefile for why this is here
1515
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
16-
endif
1716

1817
all:
1918
$(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs

Diff for: src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# needs-sanitizer-support
2+
# only-x86_64
3+
# only-linux
24

35
-include ../tools.mk
46

@@ -9,10 +11,8 @@ LOG := $(TMPDIR)/log.txt
911
# are compiled with address sanitizer, and we assert that a fault in the dylib
1012
# is correctly detected.
1113

12-
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
1314
# See comment in sanitizer-address/Makefile for why this is here
1415
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
15-
endif
1616

1717
all:
1818
$(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs

Diff for: src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# needs-sanitizer-support
2+
# only-x86_64
3+
# only-linux
24

35
-include ../tools.mk
46

57
# This test builds a staticlib, then an executable that links to it.
68
# The staticlib and executable both are compiled with address sanitizer,
79
# and we assert that a fault in the staticlib is correctly detected.
810

9-
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
10-
EXTRA_RUSTFLAG=
11-
endif
12-
1311
all:
1412
$(RUSTC) -g -Z sanitizer=address --crate-type staticlib --target $(TARGET) library.rs
1513
$(CC) program.c $(call STATICLIB,library) $(call OUT_EXE,program) $(EXTRACFLAGS) $(EXTRACXXFLAGS)

0 commit comments

Comments
 (0)