Git 2.23

diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh
index abaa0663b837631f732352dc9fa0e6c354c2aa26..fa1bba1dd93614c8ad5c7f4a37c5b612440fd0eb 100755 (executable)
--- a/t/t9820-git-p4-editor-handling.sh
+++ b/t/t9820-git-p4-editor-handling.sh
@@ -19,20 +19,16 @@ test_expect_success 'init depot' '
 
 # Check that the P4EDITOR argument can be given command-line
 # options, which git-p4 will then pass through to the shell.
-test_expect_failure 'EDITOR with options' '
+test_expect_success 'EDITOR with options' '
        git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
                echo change >file1 &&
                git commit -m "change" file1 &&
-               P4EDITOR=": >\"$git/touched\" && test-chmtime +5" git p4 submit &&
+               P4EDITOR=": >\"$git/touched\" && test-tool chmtime +5" git p4 submit &&
                test_path_is_file "$git/touched"
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done