@@ -413,7 +413,7 @@ test_external () {
413413 # test_run_, but keep its stdout on our stdout even in
414414 # non-verbose mode.
415415 " $@ " 2>&4
416- if [ " $? " = 0 ]
416+ if test " $? " = 0
417417 then
418418 if test $test_external_has_tap -eq 0; then
419419 test_ok_ " $descr "
@@ -440,11 +440,12 @@ test_external_without_stderr () {
440440 tmp=${TMPDIR:-/ tmp}
441441 stderr=" $tmp /git-external-stderr.$$ .tmp"
442442 test_external " $@ " 4> " $stderr "
443- [ -f " $stderr " ] || error " Internal error: $stderr disappeared."
443+ test -f " $stderr " || error " Internal error: $stderr disappeared."
444444 descr=" no stderr: $1 "
445445 shift
446446 say >&3 " # expecting no stderr from previous command"
447- if [ ! -s " $stderr " ]; then
447+ if test ! -s " $stderr "
448+ then
448449 rm " $stderr "
449450
450451 if test $test_external_has_tap -eq 0; then
@@ -454,8 +455,9 @@ test_external_without_stderr () {
454455 test_success=$(( $test_success + 1 ))
455456 fi
456457 else
457- if [ " $verbose " = t ]; then
458- output=` echo; echo " # Stderr is:" ; cat " $stderr " `
458+ if test " $verbose " = t
459+ then
460+ output=$( echo; echo " # Stderr is:" ; cat " $stderr " )
459461 else
460462 output=
461463 fi
@@ -474,27 +476,28 @@ test_external_without_stderr () {
474476# The commands test the existence or non-existence of $1. $2 can be
475477# given to provide a more precise diagnosis.
476478test_path_is_file () {
477- if ! [ -f " $1 " ]
479+ if ! test -f " $1 "
478480 then
479481 echo " File $1 doesn't exist. $* "
480482 false
481483 fi
482484}
483485
484486test_path_is_dir () {
485- if ! [ -d " $1 " ]
487+ if ! test -d " $1 "
486488 then
487489 echo " Directory $1 doesn't exist. $* "
488490 false
489491 fi
490492}
491493
492494test_path_is_missing () {
493- if [ -e " $1 " ]
495+ if test -e " $1 "
494496 then
495497 echo " Path exists:"
496498 ls -ld " $1 "
497- if [ $# -ge 1 ]; then
499+ if test $# -ge 1
500+ then
498501 echo " $* "
499502 fi
500503 false
@@ -646,9 +649,12 @@ test_cmp_rev () {
646649# similar to GNU seq(1), but the latter might not be available
647650# everywhere (and does not do letters). It may be used like:
648651#
649- # for i in `test_seq 100`; do
650- # for j in `test_seq 10 20`; do
651- # for k in `test_seq a z`; do
652+ # for i in $(test_seq 100)
653+ # do
654+ # for j in $(test_seq 10 20)
655+ # do
656+ # for k in $(test_seq a z)
657+ # do
652658# echo $i-$j-$k
653659# done
654660# done
0 commit comments