diff options
| author | Junio C Hamano <junkio@twinsun.com> | 2005-12-05 18:13:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-05 19:12:26 -0800 |
| commit | 8d69195124c826756c025fc84d993d92ff119075 (patch) | |
| tree | 844d05abc4a4ebcf288bb21f2d664c34d222418e /t | |
| parent | 4050c0df8ec7043315e2192695de432875239775 (diff) | |
| download | git-8d69195124c826756c025fc84d993d92ff119075.tar.gz git-8d69195124c826756c025fc84d993d92ff119075.tar.xz | |
Fix 5501 test
Not everybody can rely on /bin/sh to be sane, and we support
SHELL_PATH for that. Use it.
mktemp(1) is not used anywhere else in the core git. Do not
introduce dependency on it.
Not everybody's "which" gives a sane return value. For example,
on Solaris 'which XXX' says "no XXX in /usr/bin /bin ..." and
exits with zero status. The lesson here is to never use 'which'
in your scripts.
Signed-off-by: Junio C Hamano <junkio@twinsun.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5501-old-fetch-and-upload.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/t/t5501-old-fetch-and-upload.sh b/t/t5501-old-fetch-and-upload.sh index ada513032..596c88b1c 100755 --- a/t/t5501-old-fetch-and-upload.sh +++ b/t/t5501-old-fetch-and-upload.sh @@ -7,8 +7,9 @@ # an old counterpart cd $(dirname $0) || exit 1 +: ${SHELL_PATH=/bin/sh} -tmp=$(mktemp /tmp/tmp-XXXXXXXX) +tmp=`pwd`/.tmp$$ retval=0 @@ -25,13 +26,17 @@ for i in $list; do both) pgm="old-git-upload-pack"; replace="old-git-fetch-pack --exec=$pgm";; esac - if which $pgm 2>/dev/null; then + if where=`LANG=C LC_ALL=C which "$pgm" 2>/dev/null` && + case "$where" in + "no "*) (exit 1) ;; + esac + then echo "Testing with $pgm" sed -e "s/git-fetch-pack/$replace/g" \ -e "s/# old fails/warn/" < t5500-fetch-pack.sh > $tmp - sh $tmp || retval=$? - rm $tmp + "$SHELL_PATH" "$tmp" || retval=$? + rm -f "$tmp" test $retval != 0 && exit $retval else |