X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Frun-test-suites.sh;h=fc2f8df4f01279a50a081a8db5b175eebcb5e7d4;hb=e9ba7f91e954218cd8fdaaa8e3cf8d2f6ddc80ed;hp=e1612aa57ea0c5373bc1e4212cebf5df41c933df;hpb=c1bede3c5fe828179c6f14dc7237aafab5067352;p=lttng-ci.git

diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh
index e1612aa..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/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
-	# *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 ..