summaryrefslogtreecommitdiff
path: root/t/remake-after-makefile-am.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/remake-after-makefile-am.sh')
-rw-r--r--t/remake-after-makefile-am.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
index ebe729cdb..ca691a088 100644
--- a/t/remake-after-makefile-am.sh
+++ b/t/remake-after-makefile-am.sh
@@ -19,12 +19,6 @@
. test-init.sh
-if using_gmake; then
- remake_() { $MAKE nil; }
-else
- remake_() { $MAKE Makefile && $MAKE foo.sh; }
-fi
-
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -79,7 +73,7 @@ for vpath in : false; do
$sleep
sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = $magic1/" $srcdir/Makefile.am >t
mv -f t $srcdir/Makefile.am
- remake_
+ $MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
$FGREP $magic1 Makefile
test x"$(./foo.sh)" = x"$magic1"
@@ -87,7 +81,7 @@ for vpath in : false; do
$sleep
echo 'sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = '$magic2'/"' \
> $srcdir/tweak-makefile-am
- remake_
+ $MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
$FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
@@ -97,7 +91,6 @@ for vpath in : false; do
echo cat > $srcdir/tweak-makefile-am # Make it a no-op again.
sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = DummyValue/" $srcdir/Makefile.am >t
mv -f t $srcdir/Makefile.am
- using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && exit 1 # Sanity check.
$FGREP $magic2 Makefile && exit 1 # Likewise.