development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

test prerequisites: enumerate with commas

Browse source 
test_have_prereq does understand multiple predicates given as
separate arguments, but that is by accident.  We should list the
prerequisites just like we use them as the (first) optional
parameter for test_expect_success, concatenated with commas, for
consistency.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-07-21 15:20:36 -07:00
parent f57a8715bc
commit b0562224c9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
t/t9809-git-p4-client-view.sh
View file

@ -365,7 +365,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
( (
cd "$git" && cd "$git" &&
echo git-wild-hash >dir1/git-wild#hash && echo git-wild-hash >dir1/git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
echo git-wild-star >dir1/git-wild\*star echo git-wild-star >dir1/git-wild\*star
fi && fi &&
@ -379,7 +379,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
( (
cd "$cli" && cd "$cli" &&
test_path_is_file dir1/git-wild#hash && test_path_is_file dir1/git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
test_path_is_file dir1/git-wild\*star test_path_is_file dir1/git-wild\*star
fi && fi &&

14
t/t9812-git-p4-wildcards.sh
View file

@ -14,7 +14,7 @@ test_expect_success 'add p4 files with wildcards in the names' '
printf "file2\nhas\nsome\nrandom\ntext\n" >file2 && printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
p4 add file2 && p4 add file2 &&
echo file-wild-hash >file-wild#hash && echo file-wild-hash >file-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
echo file-wild-star >file-wild\*star echo file-wild-star >file-wild\*star
fi && fi &&
@ -31,7 +31,7 @@ test_expect_success 'wildcard files git p4 clone' '
( (
cd "$git" && cd "$git" &&
test -f file-wild#hash && test -f file-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
test -f file-wild\*star test -f file-wild\*star
fi && fi &&
@ -46,7 +46,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
( (
cd "$git" && cd "$git" &&
echo git-wild-hash >git-wild#hash && echo git-wild-hash >git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
echo git-wild-star >git-wild\*star echo git-wild-star >git-wild\*star
fi && fi &&
@ -60,7 +60,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
( (
cd "$cli" && cd "$cli" &&
test_path_is_file git-wild#hash && test_path_is_file git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
test_path_is_file git-wild\*star test_path_is_file git-wild\*star
fi && fi &&
@ -75,7 +75,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
( (
cd "$git" && cd "$git" &&
echo new-line >>git-wild#hash && echo new-line >>git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
echo new-line >>git-wild\*star echo new-line >>git-wild\*star
fi && fi &&
@ -89,7 +89,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
( (
cd "$cli" && cd "$cli" &&
test_line_count = 2 git-wild#hash && test_line_count = 2 git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
test_line_count = 2 git-wild\*star test_line_count = 2 git-wild\*star
fi && fi &&
@ -152,7 +152,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
( (
cd "$cli" && cd "$cli" &&
test_path_is_missing git-wild#hash && test_path_is_missing git-wild#hash &&
if test_have_prereq !MINGW !CYGWIN if test_have_prereq !MINGW,!CYGWIN
then then
test_path_is_missing git-wild\*star test_path_is_missing git-wild\*star
fi && fi &&