X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Frun-test-suites.sh;h=2637bc44c1efc018fe6346b90a7c5c0e17ddce47;hb=9ac936bcec3207cb1e23491909c9c1668033ba95;hp=44b6a9014ed9ca1bb4a3fa82281cf454db6e34c7;hpb=cf1271bb7a11cb708178043db11c0503f604a042;p=lttng-ci.git

diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh
index 44b6a90..2637bc4 100755
--- a/scripts/system-tests/run-test-suites.sh
+++ b/scripts/system-tests/run-test-suites.sh
@@ -71,26 +71,28 @@ 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/long_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
-	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
+
+if [[ "${failed_tests}" != "0" ]] ; then
+    find tests/ -iname '*.trs' -print0 -or -iname '*.log' -print0 | tar czf /tmp/coredump/logs.tgz --null -T -
+fi
 
+exit $failed_tests