Fix ignore-logic for sanitizer run-make tests.

This commit is contained in:
Michael Woerister 2019-04-24 11:14:24 +02:00
parent cc77087d6f
commit ff976fe0f1
3 changed files with 6 additions and 9 deletions

View file

@ -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

View file

@ -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

View file

@ -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)