From bb5dc121157fc927fe55e2d3fa3f308290629c89 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 8 Mar 2022 10:55:00 -0500 Subject: [PATCH] system-tests: simplify root_regression handling Do not use the version and only rely on the presence of the root_regression file instead. Signed-off-by: Jonathan Rajotte Change-Id: Ia310f561f2d16f513c1c20d9d34a4172ade97908 --- scripts/system-tests/run-test-suites.sh | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh index 86de721..fc2f8df 100755 --- a/scripts/system-tests/run-test-suites.sh +++ b/scripts/system-tests/run-test-suites.sh @@ -71,22 +71,11 @@ verne() { lttng_version="$1" failed_tests=0 -if [[ "$lttng_version" == "master" ]]; then - make --keep-going check || failed_tests=1 - # TODO: remove when root regression tests are merged with make check or - # in another make command. - if [ -f "./tests/root_regression" ]; then - cd "./tests" || exit 1 - prove --nocolor --verbose --merge --exec '' - < root_regression || failed_tests=1 - cd .. - fi -elif vergte "$lttng_version" "2.13"; then - # All root regression are now part of the make check - # *destructive* tests are now part of the `make`-based test suites. - export LTTNG_ENABLE_DESTRUCTIVE_TESTS="will-break-my-system" - make --keep-going check || failed_tests=1 -else - make --keep-going check || failed_tests=1 +export LTTNG_ENABLE_DESTRUCTIVE_TESTS="will-break-my-system" + +make --keep-going check || failed_tests=1 + +if [ -f "./tests/root_regression" ]; then cd "./tests" || exit 1 prove --nocolor --verbose --merge --exec '' - < root_regression || failed_tests=1 cd .. -- 2.34.1