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>

diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index e80db7aab3fd0384fb80f2735d927a26bf9114f5..897b3c3034efcab3af88d8eddc4670e274361dd5 100755 (executable)
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -365,7 +365,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$git" &&
                echo git-wild-hash >dir1/git-wild#hash &&
        (
                cd "$git" &&
                echo git-wild-hash >dir1/git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        echo git-wild-star >dir1/git-wild\*star
                fi &&
                then
                        echo git-wild-star >dir1/git-wild\*star
                fi &&


@@ -379,7 +379,7 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$cli" &&
                test_path_is_file dir1/git-wild#hash &&
        (
                cd "$cli" &&
                test_path_is_file dir1/git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        test_path_is_file dir1/git-wild\*star
                fi &&
                then
                        test_path_is_file dir1/git-wild\*star
                fi &&

diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh
index ed4b488a7eac8dd89253cdc97d83ce0eb6e0c8b4..0206771fbb91b734a626e628b21786805ebcfa22 100755 (executable)
--- a/t/t9812-git-p4-wildcards.sh
+++ b/t/t9812-git-p4-wildcards.sh
@@ -14,7 +14,7 @@ test_expect_success 'add p4 files with wildcards in the names' '
                printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
                p4 add file2 &&
                echo file-wild-hash >file-wild#hash &&
                printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
                p4 add file2 &&
                echo file-wild-hash >file-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        echo file-wild-star >file-wild\*star
                fi &&
                then
                        echo file-wild-star >file-wild\*star
                fi &&


@@ -31,7 +31,7 @@ test_expect_success 'wildcard files git p4 clone' '
        (
                cd "$git" &&
                test -f file-wild#hash &&
        (
                cd "$git" &&
                test -f file-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        test -f file-wild\*star
                fi &&
                then
                        test -f file-wild\*star
                fi &&


@@ -46,7 +46,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
        (
                cd "$git" &&
                echo git-wild-hash >git-wild#hash &&
        (
                cd "$git" &&
                echo git-wild-hash >git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        echo git-wild-star >git-wild\*star
                fi &&
                then
                        echo git-wild-star >git-wild\*star
                fi &&


@@ -60,7 +60,7 @@ test_expect_success 'wildcard files submit back to p4, add' '
        (
                cd "$cli" &&
                test_path_is_file git-wild#hash &&
        (
                cd "$cli" &&
                test_path_is_file git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        test_path_is_file git-wild\*star
                fi &&
                then
                        test_path_is_file git-wild\*star
                fi &&


@@ -75,7 +75,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
        (
                cd "$git" &&
                echo new-line >>git-wild#hash &&
        (
                cd "$git" &&
                echo new-line >>git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        echo new-line >>git-wild\*star
                fi &&
                then
                        echo new-line >>git-wild\*star
                fi &&


@@ -89,7 +89,7 @@ test_expect_success 'wildcard files submit back to p4, modify' '
        (
                cd "$cli" &&
                test_line_count = 2 git-wild#hash &&
        (
                cd "$cli" &&
                test_line_count = 2 git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        test_line_count = 2 git-wild\*star
                fi &&
                then
                        test_line_count = 2 git-wild\*star
                fi &&


@@ -152,7 +152,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
        (
                cd "$cli" &&
                test_path_is_missing git-wild#hash &&
        (
                cd "$cli" &&
                test_path_is_missing git-wild#hash &&

-               if test_have_prereq !MINGW !CYGWIN
+               if test_have_prereq !MINGW,!CYGWIN

                then
                        test_path_is_missing git-wild\*star
                fi &&
                then
                        test_path_is_missing git-wild\*star
                fi &&