lava: Remove redundant destructive tests

[lttng-ci.git] / scripts / system-tests / run-test-suites.sh

diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh
index 86de721ff59e4b9260c1904f7d8935e552c7b0c3..21782f1b179f5d5fc6d457cc905e0e5512027403 100755 (executable)
--- a/scripts/system-tests/run-test-suites.sh
+++ b/scripts/system-tests/run-test-suites.sh
@@ -71,28 +71,24 @@ 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
-       cd "./tests" || exit 1
-       prove --nocolor --verbose --merge --exec '' - < root_regression || failed_tests=1
-       cd ..
-fi
+export LTTNG_ENABLE_DESTRUCTIVE_TESTS="will-break-my-system"
 
-exit $failed_tests
+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 ..
+fi
 
+# This script doesn't exist in master anymore, but compatibility with old branches
+# should be retained until lttng-tools 2.13 is no longer supported
+if [ -f "./tests/root_destructive_tests" ]; then
+    cd "./tests" || exit 1
+    prove --nocolor --verbose --merge --exec '' - < root_destructive_tests || failed_tests=2
+    cd ..
+else
+    echo 'root_destructive_tests not found'
+fi
 
+exit $failed_tests