Merge branch 'ds/feature-macros'

diff --git a/t/t9817-git-p4-exclude.sh b/t/t9817-git-p4-exclude.sh
index 1c225707976d215426bdddffe76583d63a44e885..ec3d937c6a73bb8d89de51839af4bba4c3a73910 100755 (executable)
--- a/t/t9817-git-p4-exclude.sh
+++ b/t/t9817-git-p4-exclude.sh
@@ -53,7 +53,7 @@ test_expect_success 'clone, excluding part of repo' '
        )
 '
 
-test_expect_failure 'clone, excluding single file, no trailing /' '
+test_expect_success 'clone, excluding single file, no trailing /' '
        test_when_finished cleanup_git &&
        git p4 clone -//depot/discard_file --dest="$git" //depot/...@all &&
        (
@@ -85,7 +85,7 @@ test_expect_success 'clone, then sync with exclude' '
        )
 '
 
-test_expect_failure 'clone, then sync with exclude, no trailing /' '
+test_expect_success 'clone, then sync with exclude, no trailing /' '
        test_when_finished cleanup_git &&
        git p4 clone -//depot/discard/... -//depot/discard_file --dest="$git" //depot/...@all &&
        (
@@ -105,8 +105,4 @@ test_expect_failure 'clone, then sync with exclude, no trailing /' '
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done