test prerequisites: enumerate with commas
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>
Junio C Hamano committed
Jul 21, 2014 at 15:20 UTC
b0562224c93aca5addd994e37cd851b7a5de44b8
2 files changed
+9
-9
t/t9809-git-p4-client-view.sh
+2
-2
@@ -365,7 +365,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
365
(
366
cd "$git" &&
367
echo git-wild-hash >dir1/git-wild#hash &&
368
- if test_have_prereq !MINGW !CYGWIN
368
+ if test_have_prereq !MINGW,!CYGWIN
369
then
370
echo git-wild-star >dir1/git-wild\*star
371
fi &&
@@ -379,7 +379,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
379
(
380
cd "$cli" &&
381
test_path_is_file dir1/git-wild#hash &&
382
- if test_have_prereq !MINGW !CYGWIN
382
+ if test_have_prereq !MINGW,!CYGWIN
383
then
384
test_path_is_file dir1/git-wild\*star
385
fi &&
t/t9812-git-p4-wildcards.sh
+7
-7
@@ -14,7 +14,7 @@ test_expect_success 'add p4 files with wildcards in the names' '
14
printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
15
p4 add file2 &&
16
echo file-wild-hash >file-wild#hash &&
17
- if test_have_prereq !MINGW !CYGWIN
17
+ if test_have_prereq !MINGW,!CYGWIN
18
then
19
echo file-wild-star >file-wild\*star
20
fi &&
@@ -31,7 +31,7 @@ test_expect_success 'wildcard files git p4 clone' '
31
(
32
cd "$git" &&
33
test -f file-wild#hash &&
34
- if test_have_prereq !MINGW !CYGWIN
34
+ if test_have_prereq !MINGW,!CYGWIN
35
then
36
test -f file-wild\*star
37
fi &&
@@ -46,7 +46,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
46
(
47
cd "$git" &&
48
echo git-wild-hash >git-wild#hash &&
49
- if test_have_prereq !MINGW !CYGWIN
49
+ if test_have_prereq !MINGW,!CYGWIN
50
then
51
echo git-wild-star >git-wild\*star
52
fi &&
@@ -60,7 +60,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
60
(
61
cd "$cli" &&
62
test_path_is_file git-wild#hash &&
63
- if test_have_prereq !MINGW !CYGWIN
63
+ if test_have_prereq !MINGW,!CYGWIN
64
then
65
test_path_is_file git-wild\*star
66
fi &&
@@ -75,7 +75,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
75
(
76
cd "$git" &&
77
echo new-line >>git-wild#hash &&
78
- if test_have_prereq !MINGW !CYGWIN
78
+ if test_have_prereq !MINGW,!CYGWIN
79
then
80
echo new-line >>git-wild\*star
81
fi &&
@@ -89,7 +89,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
89
(
90
cd "$cli" &&
91
test_line_count = 2 git-wild#hash &&
92
- if test_have_prereq !MINGW !CYGWIN
92
+ if test_have_prereq !MINGW,!CYGWIN
93
then
94
test_line_count = 2 git-wild\*star
95
fi &&
@@ -152,7 +152,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
152
(
153
cd "$cli" &&
154
test_path_is_missing git-wild#hash &&
155
- if test_have_prereq !MINGW !CYGWIN
155
+ if test_have_prereq !MINGW,!CYGWIN
156
then
157
test_path_is_missing git-wild\*star
158
fi &&