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

diff --git a/runtests.sh b/runtests.sh
index 1d284372..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 "============================================================"
@@ -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