test scripts: refactor start_httpd helper

diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh
index 469a8e073992d1679e133265a93951a63132c0b4..d24c7d9e5fce0e9c0f8ef5576dab86ffdbc11331 100755 (executable)
--- a/t/t2201-add-update-typechange.sh
+++ b/t/t2201-add-update-typechange.sh
@@ -104,25 +104,25 @@ test_expect_success modify '
        } >expect-final
 '
 
-test_expect_failure diff-files '
+test_expect_success diff-files '
        git diff-files --raw >actual &&
-       diff -u expect-files actual
+       test_cmp expect-files actual
 '
 
 test_expect_success diff-index '
        git diff-index --raw HEAD -- >actual &&
-       diff -u expect-index actual
+       test_cmp expect-index actual
 '
 
-test_expect_failure 'add -u' '
+test_expect_success 'add -u' '
        rm -f ".git/saved-index" &&
        cp -p ".git/index" ".git/saved-index" &&
        git add -u &&
        git ls-files -s >actual &&
-       diff -u expect-final actual
+       test_cmp expect-final actual
 '
 
-test_expect_failure 'commit -a' '
+test_expect_success 'commit -a' '
        if test -f ".git/saved-index"
        then
                rm -f ".git/index" &&
@@ -130,11 +130,11 @@ test_expect_failure 'commit -a' '
        fi &&
        git commit -m "second" -a &&
        git ls-files -s >actual &&
-       diff -u expect-final actual &&
+       test_cmp expect-final actual &&
        rm -f .git/index &&
        git read-tree HEAD &&
        git ls-files -s >actual &&
-       diff -u expect-final actual
+       test_cmp expect-final actual
 '
 
 test_done