[ng] tests: simplify munging of header-vars.am ...

* t/am-xargs-map.sh, t/ensure-dir-exists.sh, t/internals.tap,
t/memoize.tap: ... here, since that files no more contains
'@foo@' substitutions nor '?COND?' transforms.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh
index da3621d7dde6527761f5d3495e2f0ff262ae4259..3d5db397efedf59b06ca5677d8112a09affbaee5 100755 (executable)
--- a/t/am-xargs-map.sh
+++ b/t/am-xargs-map.sh
@@ -20,14 +20,10 @@
 am_create_testdir=empty
 . ./defs || exit 1
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|=.*@[a-zA-Z0-9_]+@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 sed 's/^[0-9][0-9]*:://' > Makefile << 'END'
 01::include ./defn.mk
 02::

diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index bc396b6d7c1f3ad8d4c1bd73763780d3f0fccc76..5911c0bc62e69a3ef0ac4ee4678f84a32048a3a9 100755 (executable)
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -19,14 +19,10 @@
 am_create_testdir=empty
 . ./defs || exit 1
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|=.*@[a-zA-Z0-9_]+@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 cat > Makefile << 'END'
 include ./defn.mk
 

diff --git a/t/internals.tap b/t/internals.tap
index 90126a76b4a626dba84a7b257bf800f928d64489..6be1cf3d6c90018ed827016a8a94186710012df6 100755 (executable)
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -21,14 +21,10 @@ am_create_testdir=empty
 
 plan_ 10
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|=.*@[a-zA-Z0-9_]+@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 # WARNING: there are a lot of embedded tabs in this makefile.
 # DO NOT "NORMALIZE" THEM TO SPACES!
 cat > Makefile << 'END'

diff --git a/t/memoize.tap b/t/memoize.tap
index 5e3646bd11592c64ac7beeefff91d96e7a774205..d829918b006276fd5cc87d4a5d68199e2e840ff4 100755 (executable)
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -23,14 +23,10 @@ plan_ 17
 
 ocwd=$(pwd) || fatal_ "couldn't get current working directory"
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|=.*@[a-zA-Z0-9_]+@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 T ()
 {
   tcount=$(($tcount + 1))