diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2019-04-24 11:14:24 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2019-04-24 11:14:24 +0200 |
| commit | ff976fe0f13491f0e6d3f7cbd52ab409fd93165a (patch) | |
| tree | c8c5dacf7a5c45ad506728706ad269a24233453e | |
| parent | cc77087d6f6143927d9fe98a07ca3d12b26ce474 (diff) | |
| download | rust-ff976fe0f13491f0e6d3f7cbd52ab409fd93165a.tar.gz rust-ff976fe0f13491f0e6d3f7cbd52ab409fd93165a.zip | |
Fix ignore-logic for sanitizer run-make tests.
3 files changed, 6 insertions, 9 deletions
diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile index 36cde355468..35317dca1e8 100644 --- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile @@ -1,4 +1,6 @@ # needs-sanitizer-support +# only-x86_64 +# only-linux -include ../tools.mk @@ -9,11 +11,8 @@ LOG := $(TMPDIR)/log.txt # are compiled with address sanitizer, and we assert that a fault in the cdylib # is correctly detected. -ifeq ($(TARGET),x86_64-unknown-linux-gnu) - # See comment in sanitizer-address/Makefile for why this is here EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic -endif all: $(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile index b382ff5e7b2..24d2ebd8f48 100644 --- a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile @@ -1,4 +1,6 @@ # needs-sanitizer-support +# only-x86_64 +# only-linux -include ../tools.mk @@ -9,10 +11,8 @@ LOG := $(TMPDIR)/log.txt # are compiled with address sanitizer, and we assert that a fault in the dylib # is correctly detected. -ifeq ($(TARGET),x86_64-unknown-linux-gnu) # See comment in sanitizer-address/Makefile for why this is here EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic -endif all: $(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile index 8fa08688fdd..200dc1be4de 100644 --- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile @@ -1,4 +1,6 @@ # needs-sanitizer-support +# only-x86_64 +# only-linux -include ../tools.mk @@ -6,10 +8,6 @@ # The staticlib and executable both are compiled with address sanitizer, # and we assert that a fault in the staticlib is correctly detected. -ifeq ($(TARGET),x86_64-unknown-linux-gnu) -EXTRA_RUSTFLAG= -endif - all: $(RUSTC) -g -Z sanitizer=address --crate-type staticlib --target $(TARGET) library.rs $(CC) program.c $(call STATICLIB,library) $(call OUT_EXE,program) $(EXTRACFLAGS) $(EXTRACXXFLAGS) |