diff options
Diffstat (limited to 't/remake-mild-stress.sh')
| -rw-r--r-- | t/remake-mild-stress.sh | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh index 01876e930..5683d53d1 100644 --- a/t/remake-mild-stress.sh +++ b/t/remake-mild-stress.sh @@ -23,21 +23,6 @@ magic1=::MagicStringOne:: magic2=__MagicStringTwo__ magic3=%%MagicStringThree%% -# See if the user's make implementation support an include directive. -# We need it in this test. -echo 'all:; @echo include is supported' > incl.mk -echo 'include incl.mk' > gnu-style.mk -echo '.include "incl.mk"' > bsd-style.mk -if $MAKE -f gnu-style.mk | grep 'include is supported'; then - echo "$me: GNU make include style supported" - include_zardoz='include zardoz' -elif $MAKE -f bsd-style.mk | grep 'include is supported'; then - echo "$me: BSD make include style supported" - include_zardoz='.include "zardoz"' -else - skip_ "make doesn't support any \"include\" directive" -fi - cat > configure.ac <<END AC_INIT([$me], [1.0]) AM_INIT_AUTOMAKE @@ -52,7 +37,7 @@ EXTRA_DIST = Makefile END cat > Makefile <<END -$include_zardoz +include zardoz nil: .PHONY: nil END @@ -63,11 +48,7 @@ $AUTOMAKE ./configure -if using_gmake; then - $MAKE nil -else - $MAKE Makefile -fi +$MAKE nil grep '^#H:' zardoz.in # For debugging. $FGREP $magic1 zardoz $FGREP $magic1 zardoz.in @@ -81,17 +62,17 @@ test -f Makefile $sleep sed "s/%MAGIC3%/$magic3/" >> Makefile <<'END' my-check: - ls -l . $(srcdir) ;: For debugging. + ls -l . $(srcdir) # For debugging. test -f $(srcdir)/quux.am test -f $(srcdir)/quux.in test -f $(srcdir)/bot.in test -f $(srcdir)/top.in test ! -r $(srcdir)/zardoz.am test ! -r $(srcdir)/zardoz.in - grep FOO zardoz ;: For debugging. + grep FOO zardoz # For debugging. test x'$(FOO)' = x'%MAGIC3%' test: - ls -l ;: For debugging. + ls -l # For debugging. test x'$(FOO)' = x'dummy' .PHONY: test my-check END @@ -102,11 +83,7 @@ check-local: my-check END mv -f t zardoz.am cat zardoz.am # For debugging. -if using_gmake; then - $MAKE nil -else - $MAKE zardoz -fi +$MAKE nil $FGREP my-check zardoz # Sanity check. $FGREP $magic1 zardoz zardoz.in && exit 1 $FGREP $magic2 zardoz @@ -123,7 +100,6 @@ sed '/^#H:/d' zardoz.am > quux.am echo 'FOO = dummy' >> quux.am echo 'BAR = $(BAZ)' > top.in echo "BAZ = $magic3" > bot.in -is_gmake || $MAKE zardoz $MAKE test $FGREP my-check zardoz # Sanity check. $FGREP $magic3 quux.in && exit 1 @@ -133,14 +109,11 @@ $FGREP $magic2 zardoz && exit 1 # After the remake above, the files 'zardoz.am' and 'zardoz.in' # should be no more needed. echo 'endif' > zardoz.am # Put in a syntax error. -is_gmake || $MAKE zardoz $MAKE test rm -f zardoz.in zardoz.am # Get rid of them. -is_gmake || $MAKE zardoz $MAKE test echo 'FOO = $(BAR)' >> quux.am -is_gmake || $MAKE zardoz $MAKE distcheck : |