From 176ceb2c472c266433e01c6d8d653152885cc264 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 23 Nov 2018 18:26:02 +0100 Subject: [PATCH] tests: skip test-execute on TravisCI under ASan Unfortunately, f5f9a580dd4a3cf487b didn't help much and now the next subtest gets stuck from time to time. Let's skip test-execute altogether so as not to bother anybody with spurious failures. https://github.com/systemd/systemd/issues/10696 is still open. Everybody is welcome to share ideas :-) --- src/test/test-execute.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 9d35e4e00a5..a8e9d9c2a1f 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -616,13 +616,6 @@ static void test_exec_ambientcapabilities(Manager *m) { return; } -#ifdef __SANITIZE_ADDRESS__ - if (is_run_on_travis_ci()) { - log_notice("Skipping %s, see https://github.com/systemd/systemd/issues/10696", __func__); - return; - } -#endif - test(m, "exec-ambientcapabilities.service", 0, CLD_EXITED); test(m, "exec-ambientcapabilities-merge.service", 0, CLD_EXITED); @@ -766,6 +759,13 @@ int main(int argc, char *argv[]) { test_setup_logging(LOG_DEBUG); +#ifdef __SANITIZE_ADDRESS__ + if (is_run_on_travis_ci()) { + log_notice("Running on TravisCI under ASan, skipping, see https://github.com/systemd/systemd/issues/10696"); + return EXIT_TEST_SKIP; + } +#endif + (void) unsetenv("USER"); (void) unsetenv("LOGNAME"); (void) unsetenv("SHELL");