Fourth batch

diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 4cff6a760fc27b4f4f87c5f0387e34b3039e5518..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
        )
@@ -417,16 +417,9 @@ test_expect_success 'cleanup chmod after submit cancel' '
                ! p4 fstat -T action text &&
                test_path_is_file text+x &&
                ! p4 fstat -T action text+x &&
-               if test_have_prereq !CYGWIN
-               then
-                       stat --format=%A text | egrep ^-r-- &&
-                       stat --format=%A text+x | egrep ^-r-x
-               fi
+               ls -l text | egrep ^-r-- &&
+               ls -l text+x | egrep ^-r-x
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done