tests: Say "pass" rather than "ok" on empty lines for TAP

Lines that begin with "ok" confuse the TAP harness because it can't
distinguish them from a test counter. Work around the issue by saying
"pass" instead, which isn't a reserved TAP word.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 210e594f6f3c83cc1b0c423a0f692380ff57176b..56874996a6df278202c0bc476abec4bca3ce99c5 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -24,18 +24,18 @@ test_expect_success 'update-index and ls-files' '
        cd "$HERE" &&
        git update-index --add one &&
        case "`git ls-files`" in
        cd "$HERE" &&
        git update-index --add one &&
        case "`git ls-files`" in

-       one) echo ok one ;;
+       one) echo pass one ;;

        *) echo bad one; exit 1 ;;
        esac &&
        cd dir &&
        git update-index --add two &&
        case "`git ls-files`" in
        *) echo bad one; exit 1 ;;
        esac &&
        cd dir &&
        git update-index --add two &&
        case "`git ls-files`" in

-       two) echo ok two ;;
+       two) echo pass two ;;

        *) echo bad two; exit 1 ;;
        esac &&
        cd .. &&
        case "`git ls-files`" in
        *) echo bad two; exit 1 ;;
        esac &&
        cd .. &&
        case "`git ls-files`" in

-       dir/two"$LF"one) echo ok both ;;
+       dir/two"$LF"one) echo pass both ;;

        *) echo bad; exit 1 ;;
        esac
 '
        *) echo bad; exit 1 ;;
        esac
 '


@@ -58,17 +58,17 @@ test_expect_success 'diff-files' '
        echo a >>one &&
        echo d >>dir/two &&
        case "`git diff-files --name-only`" in
        echo a >>one &&
        echo d >>dir/two &&
        case "`git diff-files --name-only`" in

-       dir/two"$LF"one) echo ok top ;;
+       dir/two"$LF"one) echo pass top ;;

        *) echo bad top; exit 1 ;;
        esac &&
        # diff should not omit leading paths
        cd dir &&
        case "`git diff-files --name-only`" in
        *) echo bad top; exit 1 ;;
        esac &&
        # diff should not omit leading paths
        cd dir &&
        case "`git diff-files --name-only`" in

-       dir/two"$LF"one) echo ok subdir ;;
+       dir/two"$LF"one) echo pass subdir ;;

        *) echo bad subdir; exit 1 ;;
        esac &&
        case "`git diff-files --name-only .`" in
        *) echo bad subdir; exit 1 ;;
        esac &&
        case "`git diff-files --name-only .`" in

-       dir/two) echo ok subdir limited ;;
+       dir/two) echo pass subdir limited ;;

        *) echo bad subdir limited; exit 1 ;;
        esac
 '
        *) echo bad subdir limited; exit 1 ;;
        esac
 '

diff --git a/t/t2102-update-index-symlinks.sh b/t/t2102-update-index-symlinks.sh
index 1ed44ee503f9ecfb5222a9bce3f42ff2aa8127bc..4d0d0a35156ee1a7604f0ea719e93d3f765a2f91 100755 (executable)
--- a/t/t2102-update-index-symlinks.sh
+++ b/t/t2102-update-index-symlinks.sh
@@ -24,7 +24,7 @@ git update-index symlink'
 test_expect_success \
 'the index entry must still be a symbolic link' '
 case "`git ls-files --stage --cached symlink`" in
 test_expect_success \
 'the index entry must still be a symbolic link' '
 case "`git ls-files --stage --cached symlink`" in

-120000" "*symlink) echo ok;;
+120000" "*symlink) echo pass;;

 *) echo fail; git ls-files --stage --cached symlink; (exit 1);;
 esac'
 
 *) echo fail; git ls-files --stage --cached symlink; (exit 1);;
 esac'
 

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 525c9a8fdfb4953612e6946994c8e555f676bfd2..6f031af9f35e4d6350e8e6dd4619d55c66214aa6 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -26,7 +26,7 @@ test_expect_success \
         chmod 755 xfoo1 &&
         git add xfoo1 &&
         case "`git ls-files --stage xfoo1`" in
         chmod 755 xfoo1 &&
         git add xfoo1 &&
         case "`git ls-files --stage xfoo1`" in

-        100644" "*xfoo1) echo ok;;
+        100644" "*xfoo1) echo pass;;

         *) echo fail; git ls-files --stage xfoo1; (exit 1);;
         esac'
 
         *) echo fail; git ls-files --stage xfoo1; (exit 1);;
         esac'
 


@@ -35,7 +35,7 @@ test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by sym
        ln -s foo xfoo1 &&
        git add xfoo1 &&
        case "`git ls-files --stage xfoo1`" in
        ln -s foo xfoo1 &&
        git add xfoo1 &&
        case "`git ls-files --stage xfoo1`" in

-       120000" "*xfoo1) echo ok;;
+       120000" "*xfoo1) echo pass;;

        *) echo fail; git ls-files --stage xfoo1; (exit 1);;
        esac
 '
        *) echo fail; git ls-files --stage xfoo1; (exit 1);;
        esac
 '


@@ -47,7 +47,7 @@ test_expect_success \
         chmod 755 xfoo2 &&
         git update-index --add xfoo2 &&
         case "`git ls-files --stage xfoo2`" in
         chmod 755 xfoo2 &&
         git update-index --add xfoo2 &&
         case "`git ls-files --stage xfoo2`" in

-        100644" "*xfoo2) echo ok;;
+        100644" "*xfoo2) echo pass;;

         *) echo fail; git ls-files --stage xfoo2; (exit 1);;
         esac'
 
         *) echo fail; git ls-files --stage xfoo2; (exit 1);;
         esac'
 


@@ -56,7 +56,7 @@ test_expect_success SYMLINKS 'git add: filemode=0 should not get confused by sym
        ln -s foo xfoo2 &&
        git update-index --add xfoo2 &&
        case "`git ls-files --stage xfoo2`" in
        ln -s foo xfoo2 &&
        git update-index --add xfoo2 &&
        case "`git ls-files --stage xfoo2`" in

-       120000" "*xfoo2) echo ok;;
+       120000" "*xfoo2) echo pass;;

        *) echo fail; git ls-files --stage xfoo2; (exit 1);;
        esac
 '
        *) echo fail; git ls-files --stage xfoo2; (exit 1);;
        esac
 '


@@ -67,7 +67,7 @@ test_expect_success SYMLINKS \
         ln -s xfoo2 xfoo3 &&
         git update-index --add xfoo3 &&
         case "`git ls-files --stage xfoo3`" in
         ln -s xfoo2 xfoo3 &&
         git update-index --add xfoo3 &&
         case "`git ls-files --stage xfoo3`" in

-        120000" "*xfoo3) echo ok;;
+        120000" "*xfoo3) echo pass;;

         *) echo fail; git ls-files --stage xfoo3; (exit 1);;
         esac'
 
         *) echo fail; git ls-files --stage xfoo3; (exit 1);;
         esac'
 


@@ -172,7 +172,7 @@ test_expect_success 'git add --refresh' '
        test -z "`git diff-index HEAD -- foo`" &&
        git read-tree HEAD &&
        case "`git diff-index HEAD -- foo`" in
        test -z "`git diff-index HEAD -- foo`" &&
        git read-tree HEAD &&
        case "`git diff-index HEAD -- foo`" in

-       :100644" "*"M   foo") echo ok;;
+       :100644" "*"M   foo") echo pass;;

        *) echo fail; (exit 1);;
        esac &&
        git add --refresh -- foo &&
        *) echo fail; (exit 1);;
        esac &&
        git add --refresh -- foo &&