Merge branch 'js/mingw-isatty-and-dup2'

diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 24c92b6cd7b1c54eb6541a81abd7e5812b3b99b0..cf932c851411e5abd992005de474cc095abecead 100755 (executable)
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -11,19 +11,29 @@ cat >hello-script <<-EOF
        #!$SHELL_PATH
        cat hello-script
 EOF
->empty
 
-test_expect_success 'start_command reports ENOENT' '
-       test-run-command start-command-ENOENT ./does-not-exist
+test_expect_success 'start_command reports ENOENT (slash)' '
+       test-tool run-command start-command-ENOENT ./does-not-exist
+'
+
+test_expect_success 'start_command reports ENOENT (no slash)' '
+       test-tool run-command start-command-ENOENT does-not-exist
 '
 
 test_expect_success 'run_command can run a command' '
        cat hello-script >hello.sh &&
        chmod +x hello.sh &&
-       test-run-command run-command ./hello.sh >actual 2>err &&
+       test-tool run-command run-command ./hello.sh >actual 2>err &&
 
        test_cmp hello-script actual &&
-       test_cmp empty err
+       test_must_be_empty err
+'
+
+test_expect_success 'run_command is restricted to PATH' '
+       write_script should-not-run <<-\EOF &&
+       echo yikes
+       EOF
+       test_must_fail test-tool run-command run-command should-not-run
 '
 
 test_expect_success !MINGW 'run_command can run a script without a #! line' '
@@ -31,10 +41,10 @@ test_expect_success !MINGW 'run_command can run a script without a #! line' '
        cat hello-script
        EOF
        chmod +x hello &&
-       test-run-command run-command ./hello >actual 2>err &&
+       test-tool run-command run-command ./hello >actual 2>err &&
 
        test_cmp hello-script actual &&
-       test_cmp empty err
+       test_must_be_empty err
 '
 
 test_expect_success 'run_command does not try to execute a directory' '
@@ -45,9 +55,9 @@ test_expect_success 'run_command does not try to execute a directory' '
        EOF
 
        PATH=$PWD/bin1:$PWD/bin2:$PATH \
-               test-run-command run-command greet >actual 2>err &&
+               test-tool run-command run-command greet >actual 2>err &&
        test_cmp bin2/greet actual &&
-       test_cmp empty err
+       test_must_be_empty err
 '
 
 test_expect_success POSIXPERM 'run_command passes over non-executable file' '
@@ -62,15 +72,15 @@ test_expect_success POSIXPERM 'run_command passes over non-executable file' '
        EOF
 
        PATH=$PWD/bin1:$PWD/bin2:$PATH \
-               test-run-command run-command greet >actual 2>err &&
+               test-tool run-command run-command greet >actual 2>err &&
        test_cmp bin2/greet actual &&
-       test_cmp empty err
+       test_must_be_empty err
 '
 
 test_expect_success POSIXPERM 'run_command reports EACCES' '
        cat hello-script >hello.sh &&
        chmod -x hello.sh &&
-       test_must_fail test-run-command run-command ./hello.sh 2>err &&
+       test_must_fail test-tool run-command run-command ./hello.sh 2>err &&
 
        grep "fatal: cannot exec.*hello.sh" err
 '
@@ -104,17 +114,17 @@ World
 EOF
 
 test_expect_success 'run_command runs in parallel with more jobs available than tasks' '
-       test-run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+       test-tool run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'run_command runs in parallel with as many jobs as tasks' '
-       test-run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+       test-tool run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'run_command runs in parallel with more tasks than jobs available' '
-       test-run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+       test-tool run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
        test_cmp expect actual
 '
 
@@ -128,7 +138,7 @@ asking for a quick stop
 EOF
 
 test_expect_success 'run_command is asked to abort gracefully' '
-       test-run-command run-command-abort 3 false 2>actual &&
+       test-tool run-command run-command-abort 3 false 2>actual &&
        test_cmp expect actual
 '
 
@@ -137,15 +147,15 @@ no further jobs available
 EOF
 
 test_expect_success 'run_command outputs ' '
-       test-run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+       test-tool run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
        test_cmp expect actual
 '
 
 test_trace () {
        expect="$1"
        shift
-       GIT_TRACE=1 test-run-command "$@" run-command true 2>&1 >/dev/null | \
-               sed 's/.* run_command: //' >actual &&
+       GIT_TRACE=1 test-tool run-command "$@" run-command true 2>&1 >/dev/null | \
+               sed -e 's/.* run_command: //' -e '/trace: .*/d' >actual &&
        echo "$expect true" >expect &&
        test_cmp expect actual
 }