Skip to content

Commit 4ab9616

Browse files
committed
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
2 parents 723a8ad + e031669 commit 4ab9616

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/test-lib.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,12 @@ test_skip () {
10041004
to_skip=t
10051005
skipped_reason="GIT_SKIP_TESTS"
10061006
fi
1007+
if test -z "$to_skip" && test -n "$run_list" &&
1008+
! match_test_selector_list '--run' $test_count "$run_list"
1009+
then
1010+
to_skip=t
1011+
skipped_reason="--run"
1012+
fi
10071013
if test -z "$to_skip" && test -n "$test_prereq" &&
10081014
! test_have_prereq "$test_prereq"
10091015
then
@@ -1016,12 +1022,6 @@ test_skip () {
10161022
fi
10171023
skipped_reason="missing $missing_prereq${of_prereq}"
10181024
fi
1019-
if test -z "$to_skip" && test -n "$run_list" &&
1020-
! match_test_selector_list '--run' $test_count "$run_list"
1021-
then
1022-
to_skip=t
1023-
skipped_reason="--run"
1024-
fi
10251025

10261026
case "$to_skip" in
10271027
t)

0 commit comments

Comments
 (0)