From: Yann Collet <cyan@fb.com>
Date: Mon, 12 Sep 2022 17:56:00 +0000 (-0700)
Subject: Merge branch 'dev' into clean
X-Git-Tag: v1.5.4^2~159^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=361b7bd1d076ad43dfdaee80d2f4d895fadac86d;p=thirdparty%2Fzstd.git

Merge branch 'dev' into clean
---

361b7bd1d076ad43dfdaee80d2f4d895fadac86d
diff --cc tests/Makefile
index f4318ebfb,5d19904d9..afea6475a
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -185,9 -179,12 +185,14 @@@ zstreamtest_asan : CFLAGS += -fsanitize
  zstreamtest_asan : $(ZSTREAMFILES)
  	$(LINK.c) $(MULTITHREAD) $^ -o $@$(EXT)
  
 +CLEAN += zstreamtest_tsan
  zstreamtest_tsan : CFLAGS += -fsanitize=thread
  zstreamtest_tsan : $(ZSTREAMFILES)
+ 	$(LINK.c) $(MULTITHREAD) $^ -o $@$(EXT)
+ 
++CLEAN += zstreamtest_ubsan
+ zstreamtest_ubsan : CFLAGS += -fsanitize=undefined
+ zstreamtest_ubsan : $(ZSTREAMFILES)
  	$(LINK.c) $(MULTITHREAD) $^ -o $@$(EXT)
  
  # note : broken : requires symbols unavailable from dynamic library