From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 22 Feb 2012 10:50:45 +0000 (+0100)
Subject: [ng] cleanup: post-merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8290baa7eeabeb14ff98ec3e256983143200b37f;p=thirdparty%2Fautomake.git

[ng] cleanup: post-merge cleanup

* tests/parallel-tests-many.test: Avoid uses of "make -e".
* tests/depcomp-shuffle.sh: Use 'configure.ac', not 'configure.in'.
* tests/yacc-subobj-nodep.test: Likewise.
* tests/vpath-rewrite.test: Likewise.
* tests/pattern-rules.test: Likewise.
* tests/depcomp-recover.test: Likewise.
* tests/objdir.test: Likewise.
* tests/interp3.test: Likewise.
* tests/gmake-vars.test: Likewise.
* tests/fort2.test: Likewise.
---

diff --git a/tests/depcomp-recover.test b/tests/depcomp-recover.test
index 1529726f6..c8747cddc 100755
--- a/tests/depcomp-recover.test
+++ b/tests/depcomp-recover.test
@@ -22,7 +22,7 @@
 required=cc
 . ./defs || Exit 1
 
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/depcomp-shuffle.sh b/tests/depcomp-shuffle.sh
index 23c083284..56eb7a399 100755
--- a/tests/depcomp-shuffle.sh
+++ b/tests/depcomp-shuffle.sh
@@ -68,11 +68,11 @@ else
   grep_prog_out () { ./prg && ./prg | grep "$1" || Exit 1; }
 fi
 
-echo AC_PROG_CC                         >> configure.in
-echo AM_PROG_AR                         >> configure.in
-echo AC_PROG_RANLIB                     >> configure.in
-test -z "$xdir" || echo AM_PROG_CC_C_O  >> configure.in
-echo AC_OUTPUT                          >> configure.in
+echo AC_PROG_CC                         >> configure.ac
+echo AM_PROG_AR                         >> configure.ac
+echo AC_PROG_RANLIB                     >> configure.ac
+test -z "$xdir" || echo AM_PROG_CC_C_O  >> configure.ac
+echo AC_OUTPUT                          >> configure.ac
 
 if test -n "$xdir"; then
   echo AUTOMAKE_OPTIONS = subdir-objects > Makefile.am
@@ -86,7 +86,7 @@ get-exeext:
 	@echo \$(EXEEXT)
 END
 
-cat configure.in # For debugging.
+cat configure.ac # For debugging.
 cat Makefile.am  # Likewise.
 
 test -z "$xdir" || mkdir "$xdir"
diff --git a/tests/fort2.test b/tests/fort2.test
index ba99b2cf4..d7348ed55 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -51,8 +51,8 @@ cat stdout
 grep -v '\$(FCFLAGS_f' stdout && Exit 1
 grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
 
-sed '/^AC_FC_SRCEXT.*blabla/d' configure.in >t
-mv -f t configure.in
+sed '/^AC_FC_SRCEXT.*blabla/d' configure.ac >t
+mv -f t configure.ac
 
 rm -rf autom4te*.cache
 $ACLOCAL
diff --git a/tests/gmake-vars.test b/tests/gmake-vars.test
index 659d1a15c..0c4012b7d 100755
--- a/tests/gmake-vars.test
+++ b/tests/gmake-vars.test
@@ -68,7 +68,7 @@ do/test: my/prereq
 	  && test '$(<D)' = 'my'
 END
 
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
 
 $ACLOCAL
 AUTOMAKE_run
diff --git a/tests/interp3.test b/tests/interp3.test
index ba74339cc..1394c6d18 100755
--- a/tests/interp3.test
+++ b/tests/interp3.test
@@ -23,7 +23,7 @@
 required=cc
 . ./defs || Exit 1
 
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
 AC_PROG_CC
 AC_OUTPUT
 END
diff --git a/tests/objdir.test b/tests/objdir.test
index 496a425a6..0f1f84466 100755
--- a/tests/objdir.test
+++ b/tests/objdir.test
@@ -22,7 +22,7 @@
 am_create_testdir=empty
 . ./defs || Exit 1
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 AC_CONFIG_AUX_DIR([obj])
 AM_INIT_AUTOMAKE
diff --git a/tests/parallel-tests-many.test b/tests/parallel-tests-many.test
index d14b09e9e..a54d929ec 100755
--- a/tests/parallel-tests-many.test
+++ b/tests/parallel-tests-many.test
@@ -130,7 +130,7 @@ else
 END
 fi
 
-env TESTS=$deepdir/$tname-1.test $MAKE -e check \
+$MAKE check TESTS=$deepdir/$tname-1.test \
   && test -f $deepdir/$tname-1.log \
   || framework_failure_ "\"make check\" with one single tests"
 
@@ -153,7 +153,7 @@ test `cat <lst | wc -l` -eq $count
 # We need to simulate a failure of two tests.
 st=0
 env TESTS="$deepdir/$tname-1.test $deepdir/$tname-2.test" \
-    TEST_LOG_COMPILER=false $MAKE -e check > stdout && st=1
+    $MAKE check TEST_LOG_COMPILER=false > stdout && st=1
 cat stdout
 test `grep -c '^FAIL:' stdout` -eq 2 || st=1
 test $st -eq 0 || fatal_ "couldn't simulate failure of two tests"
diff --git a/tests/pattern-rules.test b/tests/pattern-rules.test
index 83e660575..c33319488 100755
--- a/tests/pattern-rules.test
+++ b/tests/pattern-rules.test
@@ -18,7 +18,7 @@
 
 . ./defs || Exit 1
 
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am <<'END'
 foo/%.out: bar/%.in
diff --git a/tests/vpath-rewrite.test b/tests/vpath-rewrite.test
index 0b4323657..0d2db6cbc 100755
--- a/tests/vpath-rewrite.test
+++ b/tests/vpath-rewrite.test
@@ -18,7 +18,7 @@
 
 . ./defs || Exit 1
 
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am << END
 bsub:
@@ -62,7 +62,7 @@ test-vpath: test-common
 	test '\$(call vr,Makefile.in )'           = \$(srcdir)/Makefile.in
 	test '\$(call vr,zap/paz.c)'              = \$(srcdir)/zap/paz.c
 	test '\$(call vr,configure $tab)'         = \$(srcdir)/configure
-	test '\$(call vr,    configure.in$tab  )' = \$(srcdir)/configure.in
+	test '\$(call vr,    configure.ac$tab  )' = \$(srcdir)/configure.ac
 
 test-intree: test-common
 	test '\$(call vr,ssub)'                   = ssub
@@ -71,7 +71,7 @@ test-intree: test-common
 	test '\$(call vr,Makefile.in )'           = Makefile.in
 	test '\$(call vr,zap/paz.c)'              = zap/paz.c
 	test '\$(call vr,configure $tab)'         = configure
-	test '\$(call vr,    configure.in$tab  )' = configure.in
+	test '\$(call vr,    configure.ac$tab  )' = configure.ac
 END
 
 $ACLOCAL
diff --git a/tests/yacc-subobj-nodep.test b/tests/yacc-subobj-nodep.test
index 81f9c6e02..80783a151 100755
--- a/tests/yacc-subobj-nodep.test
+++ b/tests/yacc-subobj-nodep.test
@@ -20,7 +20,7 @@
 required='cc yacc'
 . ./defs || Exit 1
 
-cat >configure.in <<END
+cat >configure.ac <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([no-dependencies subdir-objects])
 AC_CONFIG_FILES([Makefile])