Skip to content

Commit 96f3ccc

Browse files
szedergitster
authored andcommitted
t0000-basic: use realistic test script names in the verbose tests
Our test scripts are named something like 't1234-command.sh', but the script names used in 't0000-basic.sh' don't follow this naming convention. Normally this doesn't matter, because the test scripts themselves don't care how they are called. However, the next patch will start to include the test number in the test's verbose output, so the test script's name will matter in the two tests checking the verbose output. Update the tests 'test --verbose' and 'test --verbose-only' to follow out test script naming convention. Leave the other tests in 't0000' unchanged: changing the names of their test scripts would be only pointless code churn. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4d8ec15 commit 96f3ccc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t0000-basic.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,15 @@ test_expect_success 'pretend we have a mix of all possible results' "
276276

277277
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
278278
test_must_fail run_sub_test_lib_test \
279-
test-verbose "test verbose" --verbose <<-\EOF &&
279+
t1234-verbose "test verbose" --verbose <<-\EOF &&
280280
test_expect_success "passing test" true
281281
test_expect_success "test with output" "echo foo"
282282
test_expect_success "failing test" false
283283
test_done
284284
EOF
285-
mv test-verbose/out test-verbose/out+ &&
286-
grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
287-
check_sub_test_lib_test test-verbose <<-\EOF
285+
mv t1234-verbose/out t1234-verbose/out+ &&
286+
grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
287+
check_sub_test_lib_test t1234-verbose <<-\EOF
288288
> expecting success: true
289289
> ok 1 - passing test
290290
> Z
@@ -303,14 +303,14 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
303303

304304
test_expect_success 'test --verbose-only' '
305305
test_must_fail run_sub_test_lib_test \
306-
test-verbose-only-2 "test verbose-only=2" \
306+
t2345-verbose-only-2 "test verbose-only=2" \
307307
--verbose-only=2 <<-\EOF &&
308308
test_expect_success "passing test" true
309309
test_expect_success "test with output" "echo foo"
310310
test_expect_success "failing test" false
311311
test_done
312312
EOF
313-
check_sub_test_lib_test test-verbose-only-2 <<-\EOF
313+
check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
314314
> ok 1 - passing test
315315
> Z
316316
> expecting success: echo foo

0 commit comments

Comments
 (0)