Skip to content
This repository was archived by the owner on Aug 13, 2025. It is now read-only.

Commit 0c4c7dd

Browse files
committed
TSAN summarising line was misplaced in get_core_dumps.sh
The line summarising TSAN reports was misplaced in the ASAN territory and thus never used. I also made core dumps, assertion failures, and TSAN reports detection independent of each other.
1 parent 59ea45f commit 0c4c7dd

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

bin/tests/system/get_core_dumps.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ get_core_dumps() {
2424
}
2525

2626
core_dumps=$(get_core_dumps | tr '\n' ' ')
27-
assertion_failures=$(find "$SYSTESTDIR/" -name named.run -exec grep "assertion failure" {} + | wc -l)
28-
sanitizer_summaries=$(find "$SYSTESTDIR/" -name 'tsan.*' | wc -l)
2927
if [ -n "$core_dumps" ]; then
3028
status=1
3129
echoinfo "I:$systest:Core dump(s) found: $core_dumps"
@@ -54,13 +52,19 @@ if [ -n "$core_dumps" ]; then
5452
echoinfo "D:$systest:core dump $coredump archived as $coredump.gz"
5553
gzip -1 "${coredump}"
5654
done
57-
elif [ "$assertion_failures" -ne 0 ]; then
55+
fi
56+
57+
assertion_failures=$(find "$SYSTESTDIR/" -name named.run -exec grep "assertion failure" {} + | wc -l)
58+
if [ "$assertion_failures" -ne 0 ]; then
5859
status=1
5960
echoinfo "I:$systest:$assertion_failures assertion failure(s) found"
60-
find "$SYSTESTDIR/" -name 'tsan.*' -exec grep "SUMMARY: " {} + | sort -u | cat_d
61-
elif [ "$sanitizer_summaries" -ne 0 ]; then
61+
fi
62+
63+
tsan_failures=$(find "$SYSTESTDIR/" -name 'tsan.*' | wc -l)
64+
if [ "$tsan_failures" -ne 0 ]; then
6265
status=1
63-
echoinfo "I:$systest:$sanitizer_summaries sanitizer report(s) found"
66+
echoinfo "I:$systest:$tsan_failures TSAN sanitizer report(s) found"
67+
find "$SYSTESTDIR/" -name 'tsan.*' -exec grep "SUMMARY: " {} + | sort -u | cat_d
6468
fi
6569

6670
exit $status

0 commit comments

Comments
 (0)