GIT_TEST_PASSING_SANITIZE_LEAK=true and GIT_TEST_SANITIZE_LEAK_LOG=true use internnlly the --invert-exit-code machinery. Therefore if the user wants to use --invert-exit-code in combination with them, the result will be confusing. For the same reason, we are already using BAIL_OUT if the user tries to combine GIT_TEST_PASSING_SANITIZE_LEAK=check with --invert-exit-code. Let's do the same for GIT_TEST_PASSING_SANITIZE_LEAK=true and GIT_TEST_SANITIZE_LEAK_LOG=true. Signed-off-by: Rubén Justo <rjusto@xxxxxxxxx> --- t/test-lib.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 293caf0f20..88a34fba67 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1557,15 +1557,25 @@ then say "in GIT_TEST_PASSING_SANITIZE_LEAK=check mode, setting --invert-exit-code for TEST_PASSES_SANITIZE_LEAK != true" invert_exit_code=t fi - elif test -z "$passes_sanitize_leak" && - test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false + elif test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false then - skip_all="skipping $this_test under GIT_TEST_PASSING_SANITIZE_LEAK=true" - test_done + if test -n "$invert_exit_code" + then + BAIL_OUT "cannot use --invert-exit-code under GIT_TEST_PASSING_SANITIZE_LEAK=true" + elif test -z "$passes_sanitize_leak" + then + skip_all="skipping $this_test under GIT_TEST_PASSING_SANITIZE_LEAK=true" + test_done + fi fi if test_bool_env GIT_TEST_SANITIZE_LEAK_LOG false then + if test -n "$invert_exit_code" + then + BAIL_OUT "cannot use --invert-exit-code and GIT_TEST_SANITIZE_LEAK_LOG=true" + fi + if ! mkdir -p "$TEST_RESULTS_SAN_DIR" then BAIL_OUT "cannot create $TEST_RESULTS_SAN_DIR" -- 2.40.1
