Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Notice if the test-runner dies 

Currently, we seem to only care if the results collector errors.
We also should care if the test-runner died.

Authored-by: Rich Ercolani <rincebrain@gmail.com>
Co-authored-by: Rich Ercolani <rincebrain@gmail.com>
Reviewed-by:  Damian Szuberski <szuberskidamian@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12998
This commit is contained in:
наб 2022-02-02 23:17:46 +01:00 committed by GitHub
parent 955bf4dc04
commit 142a5010ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/zfs-tests.sh
View File

@ -700,12 +700,14 @@ msg "${TEST_RUNNER} ${QUIET:+-q}" \
"-T \"${TAGS}\"" \ "-T \"${TAGS}\"" \
"-i \"${STF_SUITE}\"" \ "-i \"${STF_SUITE}\"" \
"-I \"${ITERATIONS}\"" "-I \"${ITERATIONS}\""
${TEST_RUNNER} ${QUIET:+-q} \ { ${TEST_RUNNER} ${QUIET:+-q} \
-c "${RUNFILES}" \ -c "${RUNFILES}" \
-T "${TAGS}" \ -T "${TAGS}" \
-i "${STF_SUITE}" \ -i "${STF_SUITE}" \
-I "${ITERATIONS}" \ -I "${ITERATIONS}" \
2>&1 | tee "$RESULTS_FILE" 2>&1; echo $? >"$REPORT_FILE"; } | tee "$RESULTS_FILE"
read -r RUNRESULT <"$REPORT_FILE"
# #
# Analyze the results. # Analyze the results.
# #
@ -720,13 +722,14 @@ if [ "$RESULT" -eq "2" ] && [ -n "$RERUN" ]; then
for test_name in $MAYBES; do for test_name in $MAYBES; do
grep "$test_name " "$TEMP_RESULTS_FILE" >>"$TEST_LIST" grep "$test_name " "$TEMP_RESULTS_FILE" >>"$TEST_LIST"
done done
${TEST_RUNNER} ${QUIET:+-q} \ { ${TEST_RUNNER} ${QUIET:+-q} \
-c "${RUNFILES}" \ -c "${RUNFILES}" \
-T "${TAGS}" \ -T "${TAGS}" \
-i "${STF_SUITE}" \ -i "${STF_SUITE}" \
-I "${ITERATIONS}" \ -I "${ITERATIONS}" \
-l "${TEST_LIST}" \ -l "${TEST_LIST}" \
2>&1 | tee "$RESULTS_FILE" 2>&1; echo $? >"$REPORT_FILE"; } | tee "$RESULTS_FILE"
read -r RUNRESULT <"$REPORT_FILE"
# #
# Analyze the results. # Analyze the results.
# #
@ -748,4 +751,4 @@ if [ -n "$SINGLETEST" ]; then
rm -f "$RUNFILES" >/dev/null 2>&1 rm -f "$RUNFILES" >/dev/null 2>&1
fi fi
exit "${RESULT}" [ "$RUNRESULT" -gt 3 ] && exit "$RUNRESULT" || exit "$RESULT"