X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/584c7bf76dffe713462dc93b30d24d6ef92a8602..a055dbdd883a3c04318e13211c3ef7942314bee7:/testsuite/wildmatch.test

diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 8c67506c..9d501897 100644
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -7,13 +7,17 @@
 
 # Test the wildmatch functionality
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
-set -x
-
-"$TOOLDIR/wildtest" "$srcdir/wildtest.txt" >"$scratchdir/wild.out"
-diff $diffopt "$scratchdir/wild.out" - <<EOF
+# 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.
 EOF
+done
 
+# The script would have aborted on error, so getting here means we've won.
 exit 0