diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:39 -0800 |
| commit | 4ab9616c766b9a0929e8970569bf7dedd554bcdc (patch) | |
| tree | 0397a7ab99e10d035426db09b97d5bc47edc90e5 | |
| parent | Merge branch 'ds/test-read-graph' (diff) | |
| parent | test-lib: don't check prereqs of test cases that won't be run anyway (diff) | |
| download | tgif-4ab9616c766b9a0929e8970569bf7dedd554bcdc.tar.xz | |
Merge branch 'sg/skip-skipped-prereq'
Test update to avoid wasted cycles.
* sg/skip-skipped-prereq:
test-lib: don't check prereqs of test cases that won't be run anyway
| -rw-r--r-- | t/test-lib.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 46c4440843..e8ae150d75 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1004,6 +1004,12 @@ test_skip () { to_skip=t skipped_reason="GIT_SKIP_TESTS" fi + if test -z "$to_skip" && test -n "$run_list" && + ! match_test_selector_list '--run' $test_count "$run_list" + then + to_skip=t + skipped_reason="--run" + fi if test -z "$to_skip" && test -n "$test_prereq" && ! test_have_prereq "$test_prereq" then @@ -1016,12 +1022,6 @@ test_skip () { fi skipped_reason="missing $missing_prereq${of_prereq}" fi - if test -z "$to_skip" && test -n "$run_list" && - ! match_test_selector_list '--run' $test_count "$run_list" - then - to_skip=t - skipped_reason="--run" - fi case "$to_skip" in t) |