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>

Ævar Arnfjörð Bjarmason committed Jan 30, 2018 at 21:21 UTC 8725923b856a8391e56a0b0a3d434fe7002cbcb4
1 file changed +8 -8
t/t3070-wildmatch.sh
+8 -8
@@ -109,36 +109,36 @@ match_with_ls_files() {
109 then
110 if test -e .git/created_test_file
111 then
112 - test_expect_success "$match_function (via ls-files): match dies on '$pattern' '$text'" "
112 + test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match dies on '$pattern' '$text'" "
113 printf '%s' '$text' >expect &&
114 test_must_fail git$ls_files_args ls-files -z -- '$pattern'
115 "
116 else
117 - test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
117 + test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
118 fi
119 elif test "$match_expect" = 1
120 then
121 if test -e .git/created_test_file
122 then
123 - test_expect_success "$match_function (via ls-files): match '$pattern' '$text'" "
123 + test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match '$pattern' '$text'" "
124 printf '%s' '$text' >expect &&
125 git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
126 $match_stdout_stderr_cmp
127 "
128 else
129 - test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
129 + test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
130 fi
131 elif test "$match_expect" = 0
132 then
133 if test -e .git/created_test_file
134 then
135 - test_expect_success "$match_function (via ls-files): no match '$pattern' '$text'" "
135 + test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match '$pattern' '$text'" "
136 >expect &&
137 git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
138 $match_stdout_stderr_cmp
139 "
140 else
141 - test_expect_failure "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
141 + test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
142 fi
143 else
144 test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
@@ -174,7 +174,7 @@ match() {
174 pattern=${10}
175 fi
176
177 - test_expect_success 'cleanup after previous file test' '
177 + test_expect_success EXPENSIVE_ON_WINDOWS 'cleanup after previous file test' '
178 if test -e .git/created_test_file
179 then
180 git reset &&
@@ -184,7 +184,7 @@ match() {
184
185 printf '%s' "$text" >.git/expected_test_file
186
187 - test_expect_success "setup match file test for $text" '
187 + test_expect_success EXPENSIVE_ON_WINDOWS "setup match file test for $text" '
188 file=$(cat .git/expected_test_file) &&
189 if should_create_test_file "$file"
190 then