Merge branch 'ss/rename-tests'

diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 46b947824fd68150cfaa6018355cd086c5a8759e..190ae149cf3cb6daa0a89d50a5a44ccafdd2aaec 100755 (executable)
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -14,6 +14,9 @@ test_description='test untracked cache'
 # See <20160803174522.5571-1-pclouds@gmail.com> if you want to know
 # more.
 
+GIT_FORCE_UNTRACKED_CACHE=true
+export GIT_FORCE_UNTRACKED_CACHE
+
 sync_mtime () {
        find . -type d -ls >/dev/null
 }
@@ -23,9 +26,8 @@ avoid_racy() {
 }
 
 status_is_clean() {
-       >../status.expect &&
        git status --porcelain >../status.actual &&
-       test_cmp ../status.expect ../status.actual
+       test_must_be_empty ../status.actual
 }
 
 test_lazy_prereq UNTRACKED_CACHE '
@@ -53,7 +55,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'untracked cache is empty' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect-empty <<EOF &&
 info/exclude 0000000000000000000000000000000000000000
 core.excludesfile 0000000000000000000000000000000000000000
@@ -104,7 +106,7 @@ EOF
 '
 
 test_expect_success 'untracked cache after first status' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../dump.expect ../actual
 '
 
@@ -124,7 +126,7 @@ EOF
 '
 
 test_expect_success 'untracked cache after second status' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../dump.expect ../actual
 '
 
@@ -155,7 +157,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude $EMPTY_BLOB
 core.excludesfile 0000000000000000000000000000000000000000
@@ -202,7 +204,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude $EMPTY_BLOB
 core.excludesfile 0000000000000000000000000000000000000000
@@ -246,7 +248,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -265,7 +267,7 @@ EOF
 
 test_expect_success 'move two from tracked to untracked' '
        git rm --cached two &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -302,7 +304,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -322,7 +324,7 @@ EOF
 
 test_expect_success 'move two from untracked to tracked' '
        git add two &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -359,7 +361,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -403,7 +405,7 @@ EOF
 '
 
 test_expect_success 'untracked cache correct after commit' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -462,7 +464,7 @@ EOF
 '
 
 test_expect_success 'untracked cache correct after status' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -530,7 +532,7 @@ EOF
 '
 
 test_expect_success 'verify untracked cache dump (sparse/subdirs)' '
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        cat >../expect-from-test-dump <<EOF &&
 info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
 core.excludesfile 0000000000000000000000000000000000000000
@@ -596,66 +598,66 @@ EOF
 
 test_expect_success '--no-untracked-cache removes the cache' '
        git update-index --no-untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        echo "no untracked cache" >../expect-no-uc &&
        test_cmp ../expect-no-uc ../actual
 '
 
 test_expect_success 'git status does not change anything' '
        git status &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-no-uc ../actual
 '
 
 test_expect_success 'setting core.untrackedCache to true and using git status creates the cache' '
        git config core.untrackedCache true &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-no-uc ../actual &&
        git status &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-from-test-dump ../actual
 '
 
 test_expect_success 'using --no-untracked-cache does not fail when core.untrackedCache is true' '
        git update-index --no-untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-no-uc ../actual &&
        git update-index --untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-empty ../actual
 '
 
 test_expect_success 'setting core.untrackedCache to false and using git status removes the cache' '
        git config core.untrackedCache false &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-empty ../actual &&
        git status &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-no-uc ../actual
 '
 
 test_expect_success 'using --untracked-cache does not fail when core.untrackedCache is false' '
        git update-index --untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-empty ../actual
 '
 
 test_expect_success 'setting core.untrackedCache to keep' '
        git config core.untrackedCache keep &&
        git update-index --untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-empty ../actual &&
        git status &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-from-test-dump ../actual &&
        git update-index --no-untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-no-uc ../actual &&
        git update-index --force-untracked-cache &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-empty ../actual &&
        git status &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        test_cmp ../expect-from-test-dump ../actual
 '
 
@@ -663,29 +665,29 @@ test_expect_success 'test ident field is working' '
        mkdir ../other_worktree &&
        cp -R done dthree dtwo four three ../other_worktree &&
        GIT_WORK_TREE=../other_worktree git status 2>../err &&
-       echo "warning: Untracked cache is disabled on this system or location." >../expect &&
+       echo "warning: untracked cache is disabled on this system or location" >../expect &&
        test_i18ncmp ../expect ../err
 '
 
 test_expect_success 'untracked cache survives a checkout' '
        git commit --allow-empty -m empty &&
-       test-dump-untracked-cache >../before &&
+       test-tool dump-untracked-cache >../before &&
        test_when_finished  "git checkout master" &&
        git checkout -b other_branch &&
-       test-dump-untracked-cache >../after &&
+       test-tool dump-untracked-cache >../after &&
        test_cmp ../before ../after &&
        test_commit test &&
-       test-dump-untracked-cache >../before &&
+       test-tool dump-untracked-cache >../before &&
        git checkout master &&
-       test-dump-untracked-cache >../after &&
+       test-tool dump-untracked-cache >../after &&
        test_cmp ../before ../after
 '
 
 test_expect_success 'untracked cache survives a commit' '
-       test-dump-untracked-cache >../before &&
+       test-tool dump-untracked-cache >../before &&
        git add done/two &&
        git commit -m commit &&
-       test-dump-untracked-cache >../after &&
+       test-tool dump-untracked-cache >../after &&
        test_cmp ../before ../after
 '
 
@@ -749,7 +751,7 @@ test_expect_success '"status" after file replacement should be clean with UC=tru
        git checkout master &&
        avoid_racy &&
        status_is_clean &&
-       test-dump-untracked-cache >../actual &&
+       test-tool dump-untracked-cache >../actual &&
        grep -F "recurse valid" ../actual >../actual.grep &&
        cat >../expect.grep <<EOF &&
 / 0000000000000000000000000000000000000000 recurse valid