diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-06-30 01:48:00 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-06-30 09:38:09 +0200 |
| commit | 03ca4f1df57aa15d158a21da8253d26eada61c80 (patch) | |
| tree | 6b9741d73a3fd272731820bd65b10af9874feef5 | |
| parent | c96f4512fa4bbc0266c1bba43812f76361190699 (diff) | |
Added TSAN support.add/tsan-support-ci-and-autoconf
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 7 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 846dc80df..a720f440c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,6 +178,13 @@ jobs: maxminddb: "--with-maxminddb" msan: "--with-sanitizer" - compiler: "default-cc" + os: ubuntu-latest + arch: "x86_64" + gcrypt: "" + pcre: "--with-pcre" + maxminddb: "--with-maxminddb" + msan: "--with-thread-sanitizer" + - compiler: "default-cc" os: ubuntu-18.04 arch: "x86_64" gcrypt: "" diff --git a/configure.ac b/configure.ac index 0bde360ed..8272b6ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ AS_IF([test "${with_only_libndpi+set}" = set],[ ]) AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer])) +AC_ARG_WITH(thread-sanitizer, AS_HELP_STRING([--with-thread-sanitizer], [Build with support for thread sanitizer])) AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no]) AC_ARG_ENABLE(gprof, AS_HELP_STRING([--enable-gprof], [Enable CPU/HEAP profiling with gperftools]),[enable_gprof=$enableval],[enable_gprof=no]) AC_ARG_ENABLE(code-coverage, AS_HELP_STRING([--enable-code-coverage], [Generate Code Coverage report])) @@ -24,10 +25,24 @@ AC_ARG_ENABLE(npcap, AS_HELP_STRING([--disable-npcap], [msys2 only: Disable link AS_IF([test "x$enable_fuzztargets" = "xyes"], [BUILD_FUZZTARGETS=1], [BUILD_FUZZTARGETS=0]) AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"]) +AS_IF([test "${with_sanitizer+set}" = set -a "${with_thread_sanitizer+set}" = set],[ + AC_MSG_ERROR([Configure options `--with-sanitizer' and `--with_thread_sanitizer' can not used at the same time.]) +]) +AS_IF([test "${with_sanitizer+set}" = set -o "${with_thread_sanitizer+set}" = set],[ + CFLAGS="${CFLAGS} -O0 -g3" +],[ + CFLAGS="${CFLAGS} -g" +]) + AS_IF([test "${with_sanitizer+set}" = set],[ - CFLAGS="${CFLAGS} -g3 -O0 -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer" + CFLAGS="${CFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer" LDFLAGS="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak" -],[CFLAGS="${CFLAGS} -g"]) +]) + +AS_IF([test "${with_thread_sanitizer+set}" = set],[ + CFLAGS="${CFLAGS} -fsanitize=thread -fno-omit-frame-pointer" + LDFLAGS="${LDFLAGS} -fsanitize=thread" +]) AS_IF([test "x${enable_code_coverage}" = "xyes"],[ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" |