From ff612e66021f8a987662d2ac1567a9d714b970e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Fri, 12 Jul 2024 11:59:42 +0200 Subject: [PATCH] Fix access to logs --- Sanity/upstream-testsuite/runtest.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Sanity/upstream-testsuite/runtest.sh b/Sanity/upstream-testsuite/runtest.sh index 3412cee..d3dc5b0 100755 --- a/Sanity/upstream-testsuite/runtest.sh +++ b/Sanity/upstream-testsuite/runtest.sh @@ -70,19 +70,19 @@ rlJournalStart fi rlLogInfo "run testsuite, but kill it after 7 hours" - rlWatchdog "make -k test >$TmpDir/log 2>~$TmpDir/err" 25200 + rlWatchdog "make -k test >$TmpDir/log 2>$TmpDir/err" 25200 rlAssert0 "Let's hope we didn't have to kill it..." $? rlRun popd if $OLD_STYLE; then - grep -E -B1 '( assertion )|(Test failed)|(Error:)' log >log.fails + grep -E -B1 '( assertion )|(Test failed)|(Error:)' $TmpDir/log >log.fails rlAssertNotDiffer log.fails /dev/null while read line; do rlLogError "$line" done log.warns + grep -B1 Warning: $TmpDir/log >log.warns if ! cmp -s log.warns /dev/null; then rlLogWarning "=== They are some warnings ===" while read line; do @@ -90,7 +90,7 @@ rlJournalStart done log.errs + grep -C1 'Error' $TmpDir/err >log.errs if ! cmp -s log.errs /dev/null; then rlLogWarning "=== They are some build problems ===" while read line; do @@ -100,13 +100,13 @@ rlJournalStart else - rlAssertNotDiffer err /dev/null - rlAssertGrep '100% tests passed, 0 tests failed out of' log -qF + rlAssertNotDiffer $TmpDir/err /dev/null + rlAssertGrep '100% tests passed, 0 tests failed out of' $TmpDir/log -qF fi - rlFileSubmit log log - rlFileSubmit err err + rlFileSubmit $TmpDir/log log + rlFileSubmit $TmpDir/err err rlPhaseEnd rlPhaseStartCleanup