X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Frun-test-suites.sh;h=21782f1b179f5d5fc6d457cc905e0e5512027403;hb=eedda9798a7ef2d43fda1ebf5fd238f2b52532b1;hp=fc2f8df4f01279a50a081a8db5b175eebcb5e7d4;hpb=bb5dc121157fc927fe55e2d3fa3f308290629c89;p=lttng-ci.git diff --git a/scripts/system-tests/run-test-suites.sh b/scripts/system-tests/run-test-suites.sh index fc2f8df..21782f1 100755 --- a/scripts/system-tests/run-test-suites.sh +++ b/scripts/system-tests/run-test-suites.sh @@ -76,12 +76,19 @@ 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 .. + cd "./tests" || exit 1 + prove --nocolor --verbose --merge --exec '' - < root_regression || failed_tests=1 + cd .. fi -exit $failed_tests - - +# 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