From 8725923b856a8391e56a0b0a3d434fe7002cbcb4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
<avarab@gmail.com>
Date: Tue, 30 Jan 2018 21:21:24 +0000
Subject: [PATCH] wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
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>
---
t/t3070-wildmatch.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index bd11e5acb0..c1fc6ca730 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -109,36 +109,36 @@ match_with_ls_files() {
then
if test -e .git/created_test_file
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 &&
test_must_fail git$ls_files_args ls-files -z -- '$pattern'
"
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
elif test "$match_expect" = 1
then
if test -e .git/created_test_file
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 &&
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
$match_stdout_stderr_cmp
"
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
elif test "$match_expect" = 0
then
if test -e .git/created_test_file
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 &&
git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
$match_stdout_stderr_cmp
"
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
else
test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
@@ -174,7 +174,7 @@ match() {
pattern=${10}
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
then
git reset &&
@@ -184,7 +184,7 @@ match() {
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) &&
if should_create_test_file "$file"
then
--
2.40.0