From fe8910350c0b766b0a9897da085c18bdb0f7f055 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sun, 20 Feb 2022 18:29:18 +0800 Subject: [PATCH] Run GNU root tests at the end This should fix the profiling permission denied error on non-root tests --- util/run-gnu-test.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/run-gnu-test.sh b/util/run-gnu-test.sh index 360807013..f478e4058 100755 --- a/util/run-gnu-test.sh +++ b/util/run-gnu-test.sh @@ -31,8 +31,6 @@ export RUST_BACKTRACE=1 if test -n "$1"; then # if set, run only the test passed export RUN_TEST="TESTS=$1" -elif test -n "$CI"; then - sudo make -j "$(nproc)" check-root SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" TEST_SUITE_LOG="tests/test-suite-root.log" || : fi # * timeout used to kill occasionally errant/"stuck" processes (note: 'release' testing takes ~1 hour; 'debug' testing takes ~2.5 hours) @@ -40,3 +38,7 @@ fi # * `srcdir=..` specifies the GNU source directory for tests (fixing failing/confused 'tests/factor/tNN.sh' tests and causing no harm to other tests) #shellcheck disable=SC2086 timeout -sKILL 4h make -j "$(nproc)" check ${RUN_TEST} SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" || : # Kill after 4 hours in case something gets stuck in make + +if test -z "$1" && test -n "$CI"; then + sudo make -j "$(nproc)" check-root SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" TEST_SUITE_LOG="tests/test-suite-root.log" || : +fi