Skip to content

Commit 7e28c16

Browse files
Ramsay Jonesgitster
authored andcommitted
t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
Signed-off-by: Ramsay Jones <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0445e6f commit 7e28c16

File tree

1 file changed

+57
-51
lines changed

1 file changed

+57
-51
lines changed

t/t0000-basic.sh

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -296,66 +296,72 @@ test_expect_success 'test --verbose-only' '
296296
'
297297

298298
test_expect_success 'GIT_SKIP_TESTS' "
299-
GIT_SKIP_TESTS='git.2' \
299+
(
300+
GIT_SKIP_TESTS='git.2' && export GIT_SKIP_TESTS &&
300301
run_sub_test_lib_test git-skip-tests-basic \
301-
'GIT_SKIP_TESTS' <<-\\EOF &&
302-
for i in 1 2 3
303-
do
304-
test_expect_success \"passing test #\$i\" 'true'
305-
done
306-
test_done
307-
EOF
308-
check_sub_test_lib_test git-skip-tests-basic <<-\\EOF
309-
> ok 1 - passing test #1
310-
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
311-
> ok 3 - passing test #3
312-
> # passed all 3 test(s)
313-
> 1..3
314-
EOF
302+
'GIT_SKIP_TESTS' <<-\\EOF &&
303+
for i in 1 2 3
304+
do
305+
test_expect_success \"passing test #\$i\" 'true'
306+
done
307+
test_done
308+
EOF
309+
check_sub_test_lib_test git-skip-tests-basic <<-\\EOF
310+
> ok 1 - passing test #1
311+
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
312+
> ok 3 - passing test #3
313+
> # passed all 3 test(s)
314+
> 1..3
315+
EOF
316+
)
315317
"
316318

317319
test_expect_success 'GIT_SKIP_TESTS several tests' "
318-
GIT_SKIP_TESTS='git.2 git.5' \
320+
(
321+
GIT_SKIP_TESTS='git.2 git.5' && export GIT_SKIP_TESTS &&
319322
run_sub_test_lib_test git-skip-tests-several \
320-
'GIT_SKIP_TESTS several tests' <<-\\EOF &&
321-
for i in 1 2 3 4 5 6
322-
do
323-
test_expect_success \"passing test #\$i\" 'true'
324-
done
325-
test_done
326-
EOF
327-
check_sub_test_lib_test git-skip-tests-several <<-\\EOF
328-
> ok 1 - passing test #1
329-
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
330-
> ok 3 - passing test #3
331-
> ok 4 - passing test #4
332-
> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
333-
> ok 6 - passing test #6
334-
> # passed all 6 test(s)
335-
> 1..6
336-
EOF
323+
'GIT_SKIP_TESTS several tests' <<-\\EOF &&
324+
for i in 1 2 3 4 5 6
325+
do
326+
test_expect_success \"passing test #\$i\" 'true'
327+
done
328+
test_done
329+
EOF
330+
check_sub_test_lib_test git-skip-tests-several <<-\\EOF
331+
> ok 1 - passing test #1
332+
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
333+
> ok 3 - passing test #3
334+
> ok 4 - passing test #4
335+
> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
336+
> ok 6 - passing test #6
337+
> # passed all 6 test(s)
338+
> 1..6
339+
EOF
340+
)
337341
"
338342

339343
test_expect_success 'GIT_SKIP_TESTS sh pattern' "
340-
GIT_SKIP_TESTS='git.[2-5]' \
344+
(
345+
GIT_SKIP_TESTS='git.[2-5]' && export GIT_SKIP_TESTS &&
341346
run_sub_test_lib_test git-skip-tests-sh-pattern \
342-
'GIT_SKIP_TESTS sh pattern' <<-\\EOF &&
343-
for i in 1 2 3 4 5 6
344-
do
345-
test_expect_success \"passing test #\$i\" 'true'
346-
done
347-
test_done
348-
EOF
349-
check_sub_test_lib_test git-skip-tests-sh-pattern <<-\\EOF
350-
> ok 1 - passing test #1
351-
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
352-
> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
353-
> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
354-
> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
355-
> ok 6 - passing test #6
356-
> # passed all 6 test(s)
357-
> 1..6
358-
EOF
347+
'GIT_SKIP_TESTS sh pattern' <<-\\EOF &&
348+
for i in 1 2 3 4 5 6
349+
do
350+
test_expect_success \"passing test #\$i\" 'true'
351+
done
352+
test_done
353+
EOF
354+
check_sub_test_lib_test git-skip-tests-sh-pattern <<-\\EOF
355+
> ok 1 - passing test #1
356+
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
357+
> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
358+
> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
359+
> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
360+
> ok 6 - passing test #6
361+
> # passed all 6 test(s)
362+
> 1..6
363+
EOF
364+
)
359365
"
360366

361367
test_expect_success '--run basic' "

0 commit comments

Comments
 (0)