tests: fix a spurious failure on NetBSD-current
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 7 Jul 2013 10:37:37 +0000 (11:37 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 7 Jul 2013 10:37:37 +0000 (11:37 +0100)
Reported in automake bug#14760.

* tests/silent-custom.sh: Be prepared to handle creative
quoting in the output of the shell run for the make recipes
when the shell traces are active ("set -x").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
t/silent-custom.sh

index 7ce3ffc..b00e388 100644 (file)
@@ -80,8 +80,18 @@ do_check ()
   else
     $FGREP 'GEN ' output && exit 1
     $FGREP 'cp ./foo.in foo' output
-    $FGREP "rm -f sub/0.h sub/1.h sub/2.h" output
-    $FGREP "generate-header --flags sub/0.h sub/1.h sub/2.h" output
+    # Be prepared to handle "creative quoting" in the shell traces.
+    # See automake bug#14760.
+    ok=false
+    for q in '' \' \"; do
+      files="${q}sub/0.h${q} ${q}sub/1.h${q} ${q}sub/2.h${q}"
+      $FGREP "rm -f $files" output || continue
+      $FGREP "generate-header --flags $files" output || continue
+      ok=:
+      break
+    done
+    $ok || exit 1
+    unset ok
   fi
 }