From: Junio C Hamano Date: Wed, 6 May 2015 04:00:35 +0000 (-0700) Subject: Merge branch 'ep/fix-test-lib-functions-report' X-Git-Tag: v2.5.0-rc0~148 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64c9e027658124a29aeae47e43fa08aaff760f43 Merge branch 'ep/fix-test-lib-functions-report' * ep/fix-test-lib-functions-report: test-lib-functions.sh: fix the second argument to some helper functions --- 64c9e027658124a29aeae47e43fa08aaff760f43 diff --cc t/test-lib-functions.sh index 0698ce7908,e8981b116f..8f8858a5f0 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@@ -476,17 -381,17 +476,17 @@@ test_external_without_stderr () # The commands test the existence or non-existence of $1. $2 can be # given to provide a more precise diagnosis. test_path_is_file () { - if ! [ -f "$1" ] + if ! test -f "$1" then - echo "File $1 doesn't exist. $*" + echo "File $1 doesn't exist. $2" false fi } test_path_is_dir () { - if ! [ -d "$1" ] + if ! test -d "$1" then - echo "Directory $1 doesn't exist. $*" + echo "Directory $1 doesn't exist. $2" false fi }