Merge branch 'pw/add-p-recount' into maint

diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 37b42d03a2b4f6392c3b84303c52a839caa6befd..9779dc0d11f33b6d8a6c5b8d8ffded834eddd8b2 100755 (executable)
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -394,7 +394,7 @@ test_expect_success 'cleanup rename after submit cancel' '
        (
                cd "$cli" &&
                test_path_is_missing text2 &&
-               p4 fstat -T action text2 2>&1 | grep "no such file"
+               p4 fstat -T action text2 2>&1 | grep "no such file" &&
                test_path_is_file text &&
                ! p4 fstat -T action text
        )
@@ -422,8 +422,4 @@ test_expect_success 'cleanup chmod after submit cancel' '
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done