Re: [PATCH] {master} coverage: add tests on remake rules in more complex situations

[Stefano Lattarini]

On Saturday 09 April 2011, Ralf Wildenhues wrote:
> Hello Stefano, Bruno,
> 
> nice collaboration work there, thank you!
> 
> I have a few nits, mostly really trivial.  Feel free to push after
> addressing them.
>
I agree with almost all of your nits (and I've edited the patch
accordingly, see the attached squash-in).  I've just one minor
point below.

> --author?
>
Right, I didn't tought about that.  We should put Bruno as author here
IMHO.  OK for all involved parts?
 
> > --- /dev/null
> > +++ b/tests/remake-renamed-m4-macro.test
> 
> > +# Test remake rules when the name of an m4 macro change.  Try both with
> > +# and without indirection.
> > +
> > +. ./defs || Exit 1
> > +
>
> [CUT]
>
> > +for x in macros foo; do
> > +  sed -e 's/FOO_1/FOO_2/' m4/$x.m4 > t
> > +  mv -f t m4/$x.m4
> > +done
> > +unset x
> 
> Why this unset?  It doesn't matter to keep it.
>
Yes, but I prefer to not keep references to things that are not needed
anymore.  Anyway, in this case it is just a slight preference, so I've
removed the `unset' calls.

I will push shorty if nobody objects.

Regards,
  Stefano

diff --git a/tests/defs b/tests/defs
index 2475709..3ae743a 100644
--- a/tests/defs
+++ b/tests/defs
@@ -154,11 +154,9 @@ using_gmake ()
 {
   case $am__using_gmake in
     yes)
-      return 0
-      ;;
+      return 0;;
     no)
-      return 1
-      ;;
+      return 1;;
     '') 
       # Use --version AND -v, because SGI Make doesn't fail on --version.
       # Also grep for GNU because newer versions of FreeBSD make do
@@ -169,12 +167,10 @@ using_gmake ()
       else
         am__using_gmake=no
         return 1
-      fi
-      ;;
+      fi;;
     *)
       echo "invalid value for \$am__using_gmake: '$am__using_gmake'" >&2
-      Exit 99
-      ;;
+      Exit 99;;
   esac
 }
 
diff --git a/tests/remake-deleted-m4-file.test 
b/tests/remake-deleted-m4-file.test
index 144da2f..f71d882 100755
--- a/tests/remake-deleted-m4-file.test
+++ b/tests/remake-deleted-m4-file.test
@@ -15,9 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test remake rules when an m4 file gets removed and the macros it
-# defined gets inlined into the caller.  Try with both an indirect
+# defined get inlined into the caller.  Try with both an indirect
 # call and a direct one.  This can be seen as testing the "deleted
-# header file" issue w.r.t. aclocal.m4 dependencies.
+# header file" issue w.r.t. aclocal.m4 dependencies.  See also related
+# test `acloca22.test'.
 
 . ./defs || Exit 1
 
@@ -30,7 +31,7 @@ cat > Makefile.am <<'END'
 ACLOCAL_AMFLAGS = -I m4
 .PHONY: test
 test:
-       test '$(the_answer)' = 42
+       test '$(the_answer)' -eq 42
 END
 
 macro_value='the_answer=42; AC_SUBST([the_answer])'
diff --git a/tests/remake-gnulib-add-acsubst.test 
b/tests/remake-gnulib-add-acsubst.test
index 2377d80..74bd202 100755
--- a/tests/remake-gnulib-add-acsubst.test
+++ b/tests/remake-gnulib-add-acsubst.test
@@ -19,7 +19,7 @@
 # This test overlaps with others, and is not strictly necessary per se,
 # but it exercises a real use case (from gnulib, see:
 #  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
-# for more info), so keep it anyway.
+# for more info).
 
 . ./defs || Exit 1
 
diff --git a/tests/remake-gnulib-add-header.test 
b/tests/remake-gnulib-add-header.test
index 39d10ce..597a19a 100755
--- a/tests/remake-gnulib-add-header.test
+++ b/tests/remake-gnulib-add-header.test
@@ -19,7 +19,7 @@
 # This test overlaps with others, and is not strictly necessary per se,
 # but it exercises a real use case (from gnulib, see:
 #  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
-# for more info), so please keep it anyway.
+# for more info).
 
 . ./defs || Exit 1
 
diff --git a/tests/remake-gnulib-remove-header.test 
b/tests/remake-gnulib-remove-header.test
index 338a2da..c28a078 100755
--- a/tests/remake-gnulib-remove-header.test
+++ b/tests/remake-gnulib-remove-header.test
@@ -15,12 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test remake rules when a C header "guarded" by AC_SUBST'd variables
-# is not needed anymore, or when it's needed back.
+# is not needed anymore, or when it's needed again.
 # This test requires some user-level machinery, overlaps with other tests,
 # and is not strictly necessary per se, but it exercises a real, important
 # use case (from gnulib, see:
 #  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
-# for more info), so please keep it anyway.
+# for more info).
 
 . ./defs || Exit 1
 
@@ -95,6 +95,8 @@ for vpath in : false; do
 
   # Do not reject slow dependency extractors: we need dependency tracking.
   $srcdir/configure --enable-dependency-tracking
+  # Skip the test if dependency tracking couldn't be activated.
+  $FGREP 'depmode=none' Makefile && Exit 77
 
   $MAKE
   ls -l
diff --git a/tests/remake-moved-m4-file.test b/tests/remake-moved-m4-file.test
index 04cf36e..55b0bce 100755
--- a/tests/remake-moved-m4-file.test
+++ b/tests/remake-moved-m4-file.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test remake rules when an m4 files gets moved among different "include
+# Test remake rules when m4 files get moved among different "include
 # dirs" (i.e. those passed to aclocal with `-I' option).
 
 . ./defs || Exit 1
@@ -30,7 +30,7 @@ cat > Makefile.am <<'END'
 ACLOCAL_AMFLAGS = -I d1 -I d2 -I d3
 .PHONY: test
 test:
-       test '$(the_answer)' = 42
+       test '$(the_answer)' -eq 42
 END
 
 mkdir d1 d2 d3
diff --git a/tests/remake-renamed-m4-file.test 
b/tests/remake-renamed-m4-file.test
index ad01f6c..b2ebd79 100755
--- a/tests/remake-renamed-m4-file.test
+++ b/tests/remake-renamed-m4-file.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test remake rules when m4 files gets renamed.
+# Test remake rules when m4 files get renamed.
 
 . ./defs || Exit 1
 
@@ -29,7 +29,7 @@ cat > Makefile.am <<'END'
 ACLOCAL_AMFLAGS = -I m4
 .PHONY: test
 test:
-       test '$(the_answer)' = 42
+       test '$(the_answer)' -eq 42
 END
 
 mkdir m4
diff --git a/tests/remake-renamed-m4-macro-and-file.test 
b/tests/remake-renamed-m4-macro-and-file.test
index 8fa784d..370c1ce 100755
--- a/tests/remake-renamed-m4-macro-and-file.test
+++ b/tests/remake-renamed-m4-macro-and-file.test
@@ -31,7 +31,7 @@ cat > Makefile.am <<'END'
 ACLOCAL_AMFLAGS = -I m4
 .PHONY: test
 test:
-       test '$(the_answer)' = 42
+       test '$(the_answer)' -eq 42
 END
 
 mkdir m4
diff --git a/tests/remake-renamed-m4-macro.test 
b/tests/remake-renamed-m4-macro.test
index b34e42f..82fcf45 100755
--- a/tests/remake-renamed-m4-macro.test
+++ b/tests/remake-renamed-m4-macro.test
@@ -28,7 +28,7 @@ cat > Makefile.am <<'END'
 ACLOCAL_AMFLAGS = -I m4
 .PHONY: test
 test:
-       test '$(the_answer)' = 42
+       test '$(the_answer)' -eq 42
 END
 
 mkdir m4
@@ -55,7 +55,6 @@ for x in macros foo; do
   sed -e 's/FOO_1/FOO_2/' m4/$x.m4 > t
   mv -f t m4/$x.m4
 done
-unset x
 
 using_gmake || $MAKE Makefile
 $MAKE test
@@ -66,7 +65,6 @@ for f in m4/macros.m4 configure.in; do
   sed -e 's/MY_MACRO/YOUR_MACRO/' $f > t
   mv -f t $f
 done
-unset f
 
 using_gmake || $MAKE Makefile
 $MAKE test