@@ -413,7 +413,7 @@ test_external () {
413
413
# test_run_, but keep its stdout on our stdout even in
414
414
# non-verbose mode.
415
415
" $@ " 2>&4
416
- if [ " $? " = 0 ]
416
+ if test " $? " = 0
417
417
then
418
418
if test $test_external_has_tap -eq 0; then
419
419
test_ok_ " $descr "
@@ -440,11 +440,12 @@ test_external_without_stderr () {
440
440
tmp=${TMPDIR:-/ tmp}
441
441
stderr=" $tmp /git-external-stderr.$$ .tmp"
442
442
test_external " $@ " 4> " $stderr "
443
- [ -f " $stderr " ] || error " Internal error: $stderr disappeared."
443
+ test -f " $stderr " || error " Internal error: $stderr disappeared."
444
444
descr=" no stderr: $1 "
445
445
shift
446
446
say >&3 " # expecting no stderr from previous command"
447
- if [ ! -s " $stderr " ]; then
447
+ if test ! -s " $stderr "
448
+ then
448
449
rm " $stderr "
449
450
450
451
if test $test_external_has_tap -eq 0; then
@@ -454,8 +455,9 @@ test_external_without_stderr () {
454
455
test_success=$(( $test_success + 1 ))
455
456
fi
456
457
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 " )
459
461
else
460
462
output=
461
463
fi
@@ -474,27 +476,28 @@ test_external_without_stderr () {
474
476
# The commands test the existence or non-existence of $1. $2 can be
475
477
# given to provide a more precise diagnosis.
476
478
test_path_is_file () {
477
- if ! [ -f " $1 " ]
479
+ if ! test -f " $1 "
478
480
then
479
481
echo " File $1 doesn't exist. $* "
480
482
false
481
483
fi
482
484
}
483
485
484
486
test_path_is_dir () {
485
- if ! [ -d " $1 " ]
487
+ if ! test -d " $1 "
486
488
then
487
489
echo " Directory $1 doesn't exist. $* "
488
490
false
489
491
fi
490
492
}
491
493
492
494
test_path_is_missing () {
493
- if [ -e " $1 " ]
495
+ if test -e " $1 "
494
496
then
495
497
echo " Path exists:"
496
498
ls -ld " $1 "
497
- if [ $# -ge 1 ]; then
499
+ if test $# -ge 1
500
+ then
498
501
echo " $* "
499
502
fi
500
503
false
@@ -646,9 +649,12 @@ test_cmp_rev () {
646
649
# similar to GNU seq(1), but the latter might not be available
647
650
# everywhere (and does not do letters). It may be used like:
648
651
#
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
652
658
# echo $i-$j-$k
653
659
# done
654
660
# done
0 commit comments