diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-11-12 13:24:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-13 11:06:54 +0900 |
| commit | e0316695ec323d2dde837e32ba16a82a36d828b4 (patch) | |
| tree | 26e1cbdf4ace78bd50269a2cc2ef637257e12b47 /t/test-lib.sh | |
| parent | 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff) | |
| download | git-e0316695ec323d2dde837e32ba16a82a36d828b4.tar.gz | |
test-lib: don't check prereqs of test cases that won't be run anyway
With './t1234-foo.sh -r 5,6' we can run only specific test cases in a
test script, but our test framwork still evaluates all lazy prereqs
that the excluded test cases might depend on. This is unnecessary and
produces verbose and trace output that can be distracting. This has
been an issue ever since the '-r|--run=' options were introduced in
0445e6f0a1 (test-lib: '--run' to run only specific tests, 2014-04-30),
because that commit added the check of the list of test cases
specified with '-r' after evaluating the prereqs.
Avoid this unnecessary prereq evaluation by checking the list of test
cases specified with '-r' before looking at the prereqs.
Note that GIT_SKIP_TESTS has always been checked before the prereqs,
so prereqs necessary for tests skipped that way were not evaluated.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib.sh')
| -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 30b07e310f..d92bf0f276 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -994,6 +994,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 @@ -1006,12 +1012,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) |