tests: check error message from run_command

In git versions starting at v1.7.5-rc0~29^2 until v1.7.5-rc3~2 (Revert "run-command: prettify -D_FORTIFY_SOURCE workaround", 2011-04-18) fixed it, the run_command facility would write a truncated error message when the command is present but cannot be executed for some other reason. For example, if I add a 'hello' command to git: $ echo 'echo hello' >git-hello $ chmod +x git-hello $ PATH=.:$PATH git hello hello and make it non-executable, this is what I normally get: $ chmod -x git-hello $ git hello fatal: cannot exec 'git-hello': Permission denied But with the problematic versions, we get disturbing output: $ PATH=.:$PATH git hello fatal: $ Add some tests to make sure it doesn't happen again. The hello-script used in these tests uses cat instead of echo because on Windows the bash spawned by git converts LF to CRLF in text written by echo while the bash running tests does not, causing the test to fail if "echo" is used. Thanks to Hannes for noticing. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Improved-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Apr 20, 2011 at 05:35 UTC c0f19bf3b9c42036722396ee26d2c173d6abf761

2 files changed +25

t/t0061-run-command.sh

+23

@@ -7,8 +7,31 @@ test_description='Test run command'

8 . ./test-lib.sh

10 +cat >hello-script <<-EOF

11 + #!$SHELL_PATH

12 + cat hello-script

13 +EOF

14 +>empty

15 +

16 test_expect_success 'start_command reports ENOENT' '

17 test-run-command start-command-ENOENT ./does-not-exist

18 '

20 +test_expect_success 'run_command can run a command' '

21 + cat hello-script >hello.sh &&

22 + chmod +x hello.sh &&

23 + test-run-command run-command ./hello.sh >actual 2>err &&

24 +

25 + test_cmp hello-script actual &&

26 + test_cmp empty err

27 +'

28 +

29 +test_expect_success POSIXPERM 'run_command reports EACCES' '

30 + cat hello-script >hello.sh &&

31 + chmod -x hello.sh &&

32 + test_must_fail test-run-command run-command ./hello.sh 2>err &&

33 +

34 + grep "fatal: cannot exec.*hello.sh" err

35 +'

36 +

37 test_done

test-run-command.c

@@ -29,6 +29,8 @@ int main(int argc, char **argv)

29 fprintf(stderr, "FAIL %s\n", argv[1]);

30 return 1;

31 }

32 + if (!strcmp(argv[1], "run-command"))

33 + exit(run_command(&proc));

35 fprintf(stderr, "check usage\n");

36 return 1;