summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-07-23 20:39:06 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-07-23 20:39:06 +0100
commit43831406be5beb7d83c7798db9c96fd164b0c51d (patch)
treed6a9dd9691155ea6d20dae9e7f84e50f4fe03df9
parent0ac06406dcc6cf9c5f1fbeef340764e73cc8eae0 (diff)
parentac0e09477ca1614892799c91c327fff0ba83ad19 (diff)
downloadautomake-43831406be5beb7d83c7798db9c96fd164b0c51d.tar.gz
Merge branch 'fix-half-pr14760' into micro
* fix-half-pr14760: tests: fix a spurious failure on NetBSD-current
-rw-r--r--t/silent-custom.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index 7ce3ffcc8..b00e388b1 100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
@@ -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
}