undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/skip-skipped-prereq'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:39 -08:00
commit 4ab9616c76
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/test-lib.sh
View File

@ -1004,6 +1004,12 @@ test_skip () {
to_skip=t to_skip=t
skipped_reason="GIT_SKIP_TESTS" skipped_reason="GIT_SKIP_TESTS"
fi 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" && if test -z "$to_skip" && test -n "$test_prereq" &&
! test_have_prereq "$test_prereq" ! test_have_prereq "$test_prereq"
then then
@ -1016,12 +1022,6 @@ test_skip () {
fi fi
skipped_reason="missing $missing_prereq${of_prereq}" skipped_reason="missing $missing_prereq${of_prereq}"
fi 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 case "$to_skip" in
t) t)