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 <jonathan.rajotte-julien@efficios.com>
Change-Id: Ia310f561f2d16f513c1c20d9d34a4172ade97908

diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh
index 86de721ff59e4b9260c1904f7d8935e552c7b0c3..fc2f8df4f01279a50a081a8db5b175eebcb5e7d4 100755 (executable)
--- 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 ..