зеркало из https://github.com/microsoft/git.git
wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
Mark the newly added test which creates test files on-disk as EXPENSIVE_ON_WINDOWS. According to [1] it takes almost ten minutes to run this test file on Windows after this recent change, but just a few seconds on Linux as noted in my [2]. This could be done faster by exiting earlier, however by using this pattern we'll emit "skip" lines for each skipped test, making it clear we're not running a lot of them in the TAP output, at the cost of some overhead. 1. nycvar.QRO.7.76.6.1801061337020.1337@wbunaarf-fpuvaqryva.tvgsbejvaqbjf.bet (https://public-inbox.org/git/nycvar.QRO.7.76.6.1801061337020.1337@wbunaarf-fpuvaqryva.tvgsbejvaqbjf.bet/) 2. 87mv1raz9p.fsf@evledraar.gmail.com (https://public-inbox.org/git/87mv1raz9p.fsf@evledraar.gmail.com/) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
5b1fe6ebb7
Коммит
8725923b85
|
@ -109,36 +109,36 @@ match_with_ls_files() {
|
||||||
then
|
then
|
||||||
if test -e .git/created_test_file
|
if test -e .git/created_test_file
|
||||||
then
|
then
|
||||||
test_expect_success "$match_function (via ls-files): match dies on '$pattern' '$text'" "
|
test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match dies on '$pattern' '$text'" "
|
||||||
printf '%s' '$text' >expect &&
|
printf '%s' '$text' >expect &&
|
||||||
test_must_fail git$ls_files_args ls-files -z -- '$pattern'
|
test_must_fail git$ls_files_args ls-files -z -- '$pattern'
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
|
test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
|
||||||
fi
|
fi
|
||||||
elif test "$match_expect" = 1
|
elif test "$match_expect" = 1
|
||||||
then
|
then
|
||||||
if test -e .git/created_test_file
|
if test -e .git/created_test_file
|
||||||
then
|
then
|
||||||
test_expect_success "$match_function (via ls-files): match '$pattern' '$text'" "
|
test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match '$pattern' '$text'" "
|
||||||
printf '%s' '$text' >expect &&
|
printf '%s' '$text' >expect &&
|
||||||
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
|
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
|
||||||
$match_stdout_stderr_cmp
|
$match_stdout_stderr_cmp
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
|
test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
|
||||||
fi
|
fi
|
||||||
elif test "$match_expect" = 0
|
elif test "$match_expect" = 0
|
||||||
then
|
then
|
||||||
if test -e .git/created_test_file
|
if test -e .git/created_test_file
|
||||||
then
|
then
|
||||||
test_expect_success "$match_function (via ls-files): no match '$pattern' '$text'" "
|
test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match '$pattern' '$text'" "
|
||||||
>expect &&
|
>expect &&
|
||||||
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
|
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
|
||||||
$match_stdout_stderr_cmp
|
$match_stdout_stderr_cmp
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
test_expect_failure "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
|
test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
|
test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
|
||||||
|
@ -174,7 +174,7 @@ match() {
|
||||||
pattern=${10}
|
pattern=${10}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
test_expect_success 'cleanup after previous file test' '
|
test_expect_success EXPENSIVE_ON_WINDOWS 'cleanup after previous file test' '
|
||||||
if test -e .git/created_test_file
|
if test -e .git/created_test_file
|
||||||
then
|
then
|
||||||
git reset &&
|
git reset &&
|
||||||
|
@ -184,7 +184,7 @@ match() {
|
||||||
|
|
||||||
printf '%s' "$text" >.git/expected_test_file
|
printf '%s' "$text" >.git/expected_test_file
|
||||||
|
|
||||||
test_expect_success "setup match file test for $text" '
|
test_expect_success EXPENSIVE_ON_WINDOWS "setup match file test for $text" '
|
||||||
file=$(cat .git/expected_test_file) &&
|
file=$(cat .git/expected_test_file) &&
|
||||||
if should_create_test_file "$file"
|
if should_create_test_file "$file"
|
||||||
then
|
then
|
||||||
|
|
Загрузка…
Ссылка в новой задаче