From: Wayne Davison <wayned@samba.org>
Date: Fri, 3 Feb 2006 17:58:48 +0000 (+0000)
Subject: Decided I don't like "set -x".
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/8a3d4658eb6beef06c172702b29390c04405f618

Decided I don't like "set -x".
---

diff --git a/testsuite/batch-mode.test b/testsuite/batch-mode.test
index a767ae0e..a6af81e1 100644
--- a/testsuite/batch-mode.test
+++ b/testsuite/batch-mode.test
@@ -9,8 +9,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 cd "$tmpdir"
diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test
index 82474b99..e65fc0e2 100644
--- a/testsuite/chgrp.test
+++ b/testsuite/chgrp.test
@@ -11,8 +11,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some hardlinks
 
 mygrps="`rsync_getgroups`" || fail "Can't get groups"
diff --git a/testsuite/chmod-option.test b/testsuite/chmod-option.test
index 2813ff2f..b00b1fcb 100644
--- a/testsuite/chmod-option.test
+++ b/testsuite/chmod-option.test
@@ -9,8 +9,6 @@
 
 . $srcdir/testsuite/rsync.fns
 
-set -x
-
 # Build some files
 
 fromdir="$scratchdir/from"
diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test
index 5fda2b12..f17f3cc4 100644
--- a/testsuite/chmod-temp-dir.test
+++ b/testsuite/chmod-temp-dir.test
@@ -11,8 +11,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 tmpdir2=/tmp
diff --git a/testsuite/chmod.test b/testsuite/chmod.test
index af5e79f5..4f460450 100644
--- a/testsuite/chmod.test
+++ b/testsuite/chmod.test
@@ -11,8 +11,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 chmod 440 "$fromdir/text"
diff --git a/testsuite/chown.test b/testsuite/chown.test
index 90af529e..1be7d9e2 100644
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -13,8 +13,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 case `id -u` in
 '') ;; # If "id" failed, try to continue...
 0)  ;;
diff --git a/testsuite/compare-dest.test b/testsuite/compare-dest.test
index 915c0a71..6c23c09a 100644
--- a/testsuite/compare-dest.test
+++ b/testsuite/compare-dest.test
@@ -14,8 +14,6 @@ alt2dir="$tmpdir/alt2"
 
 # Build some files/dirs/links to copy
 
-set -x
-
 hands_setup
 
 # Setup the alt and chk dirs
diff --git a/testsuite/daemon-gzip-download.test b/testsuite/daemon-gzip-download.test
index 62e39f8d..383d8970 100644
--- a/testsuite/daemon-gzip-download.test
+++ b/testsuite/daemon-gzip-download.test
@@ -26,8 +26,6 @@ build_rsyncd_conf
 RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
 export RSYNC_CONNECT_PROG
 
-set -x
-
 hands_setup
 
 # Build chkdir with a normal rsync and an --exclude.
diff --git a/testsuite/daemon-gzip-upload.test b/testsuite/daemon-gzip-upload.test
index 363e8468..49a7b1ae 100644
--- a/testsuite/daemon-gzip-upload.test
+++ b/testsuite/daemon-gzip-upload.test
@@ -20,8 +20,6 @@ build_rsyncd_conf
 RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
 export RSYNC_CONNECT_PROG
 
-set -x
-
 hands_setup
 
 # Build chkdir with a normal rsync and an --exclude.
diff --git a/testsuite/delete.test b/testsuite/delete.test
index 1400bc24..99791d5a 100644
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -9,8 +9,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 makepath "$chkdir"
diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 23d2994e..a96f560d 100644
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -21,8 +21,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some hardlinks
 
 mkdir "$fromdir"
diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index f018c553..d59c8028 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -15,8 +15,6 @@
 CVSIGNORE='*.junk'
 export CVSIGNORE
 
-set -x
-
 # Build some files/dirs/links to copy
 
 makepath "$fromdir/foo/down/to/you"
diff --git a/testsuite/fuzzy.test b/testsuite/fuzzy.test
index 3cae91a8..1eb0a7a3 100644
--- a/testsuite/fuzzy.test
+++ b/testsuite/fuzzy.test
@@ -9,8 +9,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 mkdir "$fromdir"
 mkdir "$todir"
 
diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index 924ca44c..4ffad97b 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -12,8 +12,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some hardlinks
 
 fromdir="$scratchdir/from"
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 5df176c8..2a40b7de 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -10,8 +10,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 lddir="$tmpdir/ld"
 
 chkfile="$scratchdir/rsync.chk"
diff --git a/testsuite/longdir.test b/testsuite/longdir.test
index 386012f6..a3aff9a9 100644
--- a/testsuite/longdir.test
+++ b/testsuite/longdir.test
@@ -7,8 +7,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
 longname=This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job
diff --git a/testsuite/merge.test b/testsuite/merge.test
index cc7f1887..80598149 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -9,8 +9,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some files/dirs/links to copy
 
 from1dir="${fromdir}1"
diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index 42ce2d35..eec7a301 100644
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -10,8 +10,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 build_symlinks || test_fail "failed to build symlinks"
 
 # Copy recursively, but without -l or -L or -a, and all the symlinks
diff --git a/testsuite/trimslash.test b/testsuite/trimslash.test
index 56e79cc6..d98ff87b 100644
--- a/testsuite/trimslash.test
+++ b/testsuite/trimslash.test
@@ -9,8 +9,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 "$TOOLDIR/trimslash" "/usr/local/bin" "/usr/local/bin/" "/usr/local/bin///" \
 	"//a//" "////" \
         "/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
diff --git a/testsuite/unsafe-links.test b/testsuite/unsafe-links.test
index 28c5c6df..058269ef 100644
--- a/testsuite/unsafe-links.test
+++ b/testsuite/unsafe-links.test
@@ -32,8 +32,6 @@ ln -s ../files/file1 "from/safe/links/"
 ln -s ../files/file2 "from/safe/links/"
 ln -s ../../unsafe/unsafefile "from/safe/links/"
 
-set -x
-
 echo "rsync with relative path and just -a";
 $RSYNC -avv from/safe/ to
 test_symlink to/links/file1
diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 2e95b86c..9d501897 100644
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -9,11 +9,10 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # This test exercises the wildmatch() function (with no options) and the
 # wildmatch_join() function (using -x and/or -e).
 for opts in "" -x1 "-x1 -e1" "-x1 -e1se" -x2 "-x2 -ese" -x3 "-x3 -e1" -x4 "-x4 -e2e" -x5 "-x5 -es"; do
+    echo Running wildtest with "$opts"
     "$TOOLDIR/wildtest" $opts "$srcdir/wildtest.txt" >"$scratchdir/wild.out"
     diff $diffopt "$scratchdir/wild.out" - <<EOF
 No wildmatch errors found.