From 668f7d873ada3d65daba3e269581052e07708682 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 18 Apr 2019 14:29:23 +0200 Subject: [PATCH] ci: treat config.ta_update test as a special snowflake config.ta_update test doesn't play along with others and wants all of the runner's attention to itself, otherwise it throws a tantrum. --- .gitlab-ci.yml | 4 ++-- modules/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 511b81289..cdec810f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -302,11 +302,11 @@ root.hints: - scripts/update-root-hints.sh test:valgrind: - <<: *test_flaky # lost block in /bin/bash during ta_update when: delayed start_in: '30 seconds' script: - - ${MESON_TEST} --suite unit --suite config --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" + - ${MESON_TEST} --suite unit --suite config --no-suite snowflake --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" + - MESON_TESTTHREADS=1 ${MESON_TEST} --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" --suite snowflake # }}} # extended {{{ diff --git a/modules/meson.build b/modules/meson.build index 5df7fedd8..3ae4b56de 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -23,7 +23,7 @@ config_tests += [ ['hints', files('hints/tests/hints.test.lua')], ['nsid', files('nsid/nsid.test.lua')], ['dns64', files('dns64/dns64.test.lua')], - ['ta_update', files('ta_update/ta_update.test.lua')], + ['ta_update', files('ta_update/ta_update.test.lua'), ['snowflake']], ] integr_tests += [ -- 2.47.2