mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib: invert return value of check_test_results_san_file_empty

Browse Source 
We have a function to check whether LSan logged any leaks. It returns
success for no leaks, and non-zero otherwise. This is the simplest thing
for its callers, who want to say "if no leaks then return early". But
because it's implemented as a shell pipeline, you end up with the
awkward:

  ! find ... |
  xargs grep leaks |
  grep -v false-positives

where the "!" is actually negating the final grep. Switch the return
value (and name) to return success when there are leaks. This should
make the code a little easier to read, and the negation in the callers
still reads pretty naturally.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2025-01-07 02:05:01 -05:00
committed by Junio C Hamano
parent b119a687d4
commit 8d24d56ce1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/test-lib-functions.sh
View File

@ -927,7 +927,7 @@ test_expect_success () {
test -n "$test_skip_test_preamble" ||
say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $test_body"
if test_run_ "$test_body" &&
check_test_results_san_file_empty_
! check_test_results_san_file_has_entries_
then
test_ok_ "$1"
else

8
t/test-lib.sh
View File

@ -1169,12 +1169,12 @@ test_atexit_handler () {
teardown_malloc_check
}
check_test_results_san_file_empty_ () {
test -z "$TEST_RESULTS_SAN_FILE" && return 0
check_test_results_san_file_has_entries_ () {
test -z "$TEST_RESULTS_SAN_FILE" && return 1
# stderr piped to /dev/null because the directory may have
# been "rmdir"'d already.
! find "$TEST_RESULTS_SAN_DIR" \
find "$TEST_RESULTS_SAN_DIR" \
-type f \
-name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
xargs grep ^DEDUP_TOKEN |
@ -1182,7 +1182,7 @@ check_test_results_san_file_empty_ () {
}
check_test_results_san_file_ () {
if check_test_results_san_file_empty_
if ! check_test_results_san_file_has_entries_
then
return
fi &&