summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2020-09-17 17:38:59 (GMT)
committerYann Collet <cyan@fb.com>2020-09-17 17:38:59 (GMT)
commit43bbb7decc8296078ce191b06b0af494ddad0535 (patch)
tree6c4c2b98dd81ec3a3f693b44ceb8b5669e4ac093
parentee01df1271518df8757e692ce10766e66472ea93 (diff)
parentcfd1d8f9d0bf17ef69a789d9238e6e88f1b45275 (diff)
downloadlz4-43bbb7decc8296078ce191b06b0af494ddad0535.zip
lz4-43bbb7decc8296078ce191b06b0af494ddad0535.tar.gz
lz4-43bbb7decc8296078ce191b06b0af494ddad0535.tar.bz2
Merge branch 'usan_null' of github.com:Cyan4973/lz4 into usan_null
-rw-r--r--Makefile6
-rw-r--r--tests/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ab695ea..ef1fd2e 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ check:
.PHONY: test
test:
- $(MAKE) -C $(TESTDIR) $@
- $(MAKE) -C $(EXDIR) $@
+ CFLAGS="$(CFLAGS)" $(MAKE) -C $(TESTDIR) $@
+ CFLAGS="$(CFLAGS)" $(MAKE) -C $(EXDIR) $@
clangtest: CFLAGS ?= -O3
clangtest: CFLAGS += -Werror -Wconversion -Wno-sign-conversion
@@ -143,7 +143,7 @@ clangtest-native: clean
@CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(TESTDIR) native CC=clang
usan: clean
- CC=clang CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
+ CC=clang CFLAGS="-O3 -g -fsanitize=undefined -fno-sanitize-recover=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
usan32: clean
CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
diff --git a/tests/Makefile b/tests/Makefile
index 5a6ec59..43c9651 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -35,7 +35,7 @@ PYTHON ?= python3
DEBUGLEVEL?= 1
DEBUGFLAGS = -g -DLZ4_DEBUG=$(DEBUGLEVEL)
-CFLAGS ?= -O3 # can select custom optimization flags. For example : CFLAGS=-O2 make
+CFLAGS ?= -O3 # can select custom optimization flags. Example : CFLAGS=-O2 make
CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow \
-Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes \
-Wpointer-arith -Wstrict-aliasing=1