Merge branch 'sr/gpg-interface-stop-at-the-end'

diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 7530d22de290a4c212ad1835e502e59384c78e74..67ff2711f5f5fd9ab95cbf05df8f38868e24bbec 100755 (executable)
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -151,7 +151,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio
 '
 
 test_expect_success 'restart p4d' '
-       kill_p4d &&
+       stop_and_cleanup_p4d &&
        start_p4d
 '
 
@@ -412,7 +412,7 @@ test_expect_failure 'git p4 clone file subset branch' '
 '
 
 # Check that excluded files are omitted during import
-test_expect_failure 'git p4 clone complex branches with excluded files' '
+test_expect_success 'git p4 clone complex branches with excluded files' '
        test_when_finished cleanup_git &&
        test_create_repo "$git" &&
        (
@@ -545,7 +545,7 @@ test_expect_success 'use-client-spec detect-branches skips files in branches' '
 '
 
 test_expect_success 'restart p4d' '
-       kill_p4d &&
+       stop_and_cleanup_p4d &&
        start_p4d
 '
 
@@ -651,7 +651,7 @@ test_expect_success 'Update a file in git side and submit to P4 using client vie
 '
 
 test_expect_success 'restart p4d (case folding enabled)' '
-       kill_p4d &&
+       stop_and_cleanup_p4d &&
        start_p4d -C1
 '
 
@@ -742,8 +742,4 @@ test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone with client-spec, branchL
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done