From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2019 23:29:29 +0000 (-0800)
Subject: Merge branch 'hb/t0061-dot-in-path-fix'
X-Git-Tag: v2.21.0-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68f1c0d102f4422c4fa59f597335ddef7602d27e?ds=inline;hp=--cc

Merge branch 'hb/t0061-dot-in-path-fix'

Test update.

* hb/t0061-dot-in-path-fix:
t0061: do not fail test if '.' is part of $PATH
---

68f1c0d102f4422c4fa59f597335ddef7602d27e
diff --cc t/t0061-run-command.sh
index 96bf6d6a7d,e622024cb2..99a614bc7c
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@@ -25,13 -24,21 +25,21 @@@ test_expect_success 'start_command repo
  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' '
+ 
+ test_lazy_prereq RUNS_COMMANDS_FROM_PWD '
+ 	write_script runs-commands-from-pwd <<-\EOF &&
+ 	true
+ 	EOF
+ 	runs-commands-from-pwd >/dev/null 2>&1
+ '
+ 
+ test_expect_success !RUNS_COMMANDS_FROM_PWD 'run_command is restricted to PATH' '
  	write_script should-not-run <<-\EOF &&
  	echo yikes
  	EOF