X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/12b9c8409e2bfcd8f5eada3fad3d40cdbd673509..320989b05d7242149be03cd021d11e7201e4f937:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 55c6149c..f21371be 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -101,8 +101,11 @@ RUNSHFLAGS='-e'
 
 if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
 then
-    RUNSHFLAGS="$RUNSHFLAGS -x"
-    set -x
+    if set -x
+    then
+	# If it doesn't work the first time, don't keep trying.
+	RUNSHFLAGS="$RUNSHFLAGS -x"
+    fi
 fi
 
 echo "============================================================"
@@ -110,13 +113,13 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-if ! test -f $rsync_bin
+if test ! -f $rsync_bin
 then
     echo "rsync_bin $rsync_bin is not a file" >&2
     exit 2
 fi
 
-if ! test -d $srcdir
+if test ! -d $srcdir
 then
     echo "srcdir $srcdir is not a directory" >&2
     exit 2
@@ -166,7 +169,10 @@ do
 	*)
 	    echo "----- $testbase failed!"
 	    failed=`expr $failed + 1`
-	    [ "$nopersist" = "yes" ] && exit 1
+	    if [ "x$nopersist" = "xyes" ]
+	    then
+		exit 1
+	    fi
 	esac
     fi
 done