X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Fsetup.cpp;h=8ee8bda09a6ec9a1f9167dd207d644f8b3f3c5bc;hb=035a77665b2f811160371bda237fb6e91950c306;hp=a0325af52530637fb1b95058e7e6e3e41d72d862;hpb=93ffedc620e1df2b0007fdd334c1319427502ea1;p=awesomized%2Flibmemcached diff --git a/test/setup.cpp b/test/setup.cpp index a0325af5..8ee8bda0 100644 --- a/test/setup.cpp +++ b/test/setup.cpp @@ -1,4 +1,5 @@ #include "mem_config.h" +#include "test/conf.h" #include "test/lib/env.hpp" #include "test/lib/random.hpp" #include @@ -7,7 +8,9 @@ #include #include #include -#include +#if HAVE_UNISTD_H +# include +#endif static void sigchld(int, siginfo_t *si, void *) { switch (si->si_code) { @@ -32,7 +35,6 @@ static void sigchld(int, siginfo_t *si, void *) { static inline void setup_signals() { struct sigaction sa; - memset(&sa, 0, sizeof(sa)); sa.sa_flags = SA_NOCLDSTOP | SA_RESTART | SA_SIGINFO | SA_NODEFER; @@ -56,6 +58,10 @@ static inline void setup_signals() { "verify_asan_link_order=1," \ "abort_on_error=0," \ "" +# define LSAN_OPTIONS \ + "suppressions=" SOURCES_ROOT "/test/LeakSanitizer.suppressions," \ + "" + static inline void setup_asan(char **argv) { const auto set = getenv("ASAN_OPTIONS"); @@ -65,8 +71,36 @@ static inline void setup_asan(char **argv) { perror("exec()"); } } +static inline void setup_lsan(char **argv) { + const auto set = getenv("LSAN_OPTIONS"); + + if (!set || !*set) { + SET_ENV_EX(lsan, "LSAN_OPTIONS", LSAN_OPTIONS, 0); + execvp(argv[0], argv); + perror("exec()"); + } +} #else # define setup_asan(a) (void) a +# define setup_lsan(a) (void) a +#endif + +#if HAVE_TSAN +# define TSAN_OPTIONS \ + "abort_on_error=0," \ + "halt_on_error=0" \ + "" +static inline void setup_tsan(char **argv) { + const auto set = getenv("TSAN_OPTIONS"); + + if (!set || !*set) { + SET_ENV_EX(tsan, "TSAN_OPTIONS", TSAN_OPTIONS, 0); + execvp(argv[0], argv); + perror("exec()"); + } +} +#else +# define setup_tsan(a) (void) a #endif #if LIBMEMCACHED_WITH_SASL_SUPPORT @@ -78,11 +112,16 @@ static inline void setup_sasl() { # define setup_sasl() #endif -int setup(int &, char ***argv) { +static inline void setup_random() { random_setup(); +} +int setup(int &, char ***argv) { setup_signals(); + setup_random(); setup_asan(*argv); + setup_lsan(*argv); + setup_tsan(*argv); setup_sasl(); return 0;