tests: few tweakings and cosmetic changes

* tests/dist-formats.tap: Fix botched spacing.
* tests/subobjname.test: Prefer spaces to tabs in indentation.
* tests/cond43.test: Likewise.
* tests/comment7.test: Likewise.
* tests/compile_f90_c_cxx.test: Use "$tab" instead of literal
tab characters in the grep regexp.
* tests/compile_f_c_cxx.test: Likewise.
* tests/pluseq3.test: Likewise.
* tests/cond-basic.test: Likewise.
* tests/acloca16.test: Add empty line before trailing ':' command.
* tests/bsource.test: Likewise.
* tests/depend5.test: Likewise.
* tests/depend6.test: Likewise.
* tests/destdir.test: Likewise.
* tests/fort2.test: Likewise.
* tests/instdir-java.test: Likewise.
* tests/instdir-lisp.test: Likewise.
* tests/instdir-python.test: Likewise.
* tests/instdir.test: Likewise.
* tests/instdir2.test: Likewise.
* tests/ltinstloc.test: Likewise.
* tests/missing.test: Likewise.
* tests/missing2.test: Likewise.
* tests/nodef.test: Likewise.
* tests/nodef2.test: Likewise.
* tests/subst4.test: Likewise.
* tests/werror3.test: Likewise.
* tests/commen11.test: Likewise.  Also, make grepping of automake
stderr slightly stricter, and properly quote strings with shell
metacharacters.
* tests/nodep2.test: Add empty line before trailing ':' command.
Do not create unneeded dummy source files.

diff --git a/tests/acloca16.test b/tests/acloca16.test
index 330085635bc7660e2df200b6e885f9949d462ca2..1d897ed88d70d68b77c22af229e4433ab09de943 100755 (executable)
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,4 +32,5 @@ EOF
 
 $ACLOCAL -I m4
 grep m4/some.m4 aclocal.m4 && Exit 1
+
 :

diff --git a/tests/bsource.test b/tests/bsource.test
index 38f8a43c7a216efb4684d3938733b57607af5c48..d50c1d5c073f50f0ac5f6c67e6bc44d4b48442d6 100755 (executable)
--- a/tests/bsource.test
+++ b/tests/bsource.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,4 +28,5 @@ END
 $ACLOCAL
 $AUTOMAKE
 grep 'install-recursive' Makefile.in && Exit 1
+
 :

diff --git a/tests/commen11.test b/tests/commen11.test
index b092d3978bf18f2fba1f1b5ad930b2a41a5f040a..f355cc3247e1b3f3ff6ae01b1df97212cc4807d5 100755 (executable)
--- a/tests/commen11.test
+++ b/tests/commen11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ mkdir foo
 
 $ACLOCAL
 AUTOMAKE_fails
-grep 3.*backslash stderr
-grep 7.*backslash stderr
+grep '^Makefile\.am:3:.*backslash' stderr
+grep '^Makefile\.am:7:.*backslash' stderr
+
 :

diff --git a/tests/comment7.test b/tests/comment7.test
index 7d869de54bbaaa5c1db2fc6f09e808920ac73c42..26854a130934bf8774d22e3956f04e85aa8f5261 100755 (executable)
--- a/tests/comment7.test
+++ b/tests/comment7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,12 +42,12 @@ test `grep '@COND_FALSE@VAR' Makefile.in | wc -l` = 1
 
 # Make sure the right definition follows each comment.
 sed -n '/^#.*VAR.*COND_TRUE/ {
-         n
-         p
-       }' Makefile.in |
+          n
+          p
+        }' Makefile.in |
   grep '@COND_TRUE@VAR = foo'
 sed -n '/^#.*VAR.*COND_FALSE/ {
-         n
-         p
-       }' Makefile.in |
+          n
+          p
+        }' Makefile.in |
   grep '@COND_FALSE@VAR = bar'

diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index ec593ca4be02e1ed554c349df0f44862fca88004..b38f67d50ec7c5bb5c8ed62517699dc9c6ff0d95 100755 (executable)
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
+# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011, 2012 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -35,10 +35,10 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-# Look for the macros at the beginning of rules.  Be careful, as there
-# are literal tabs at the beginning of the search strings.
-$FGREP '       $(COMPILE)'    Makefile.in
-$FGREP '       $(CXXCOMPILE)' Makefile.in
-$FGREP '       $(FCCOMPILE)'  Makefile.in
+# Look for the macros at the beginning of rules.
+tab=
+$FGREP "$tab\$(COMPILE)"    Makefile.in
+$FGREP "$tab\$(CXXCOMPILE)" Makefile.in
+$FGREP "$tab\$(FCCOMPILE)"  Makefile.in
 
 :

diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index e3b51a42130badebd5193aab0c3305678aff54e9..aaa5abd254f53956e8e663d66ce2ad611c7be7ee 100755 (executable)
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011 Free Software
+# Copyright (C) 1998, 1999, 2001, 2002, 2010, 2011, 2012 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -39,10 +39,9 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-# Look for the macros at the beginning of rules.  Be careful, as there
-# are literal tabs at the beginning of the search strings.
-$FGREP '       $(COMPILE)'    Makefile.in
-$FGREP '       $(CXXCOMPILE)' Makefile.in
-$FGREP '       $(F77COMPILE)' Makefile.in
+# Look for the macros at the beginning of rules.
+$FGREP "$tab\$(COMPILE)"    Makefile.in
+$FGREP "$tab\$(CXXCOMPILE)" Makefile.in
+$FGREP "$tab\$(F77COMPILE)" Makefile.in
 
 :

diff --git a/tests/cond-basic.test b/tests/cond-basic.test
index 2866aa6010dbfdfecc23c73630d31503e9930e05..5a64000361759deca9636dfbf01a3c46abdb7435 100755 (executable)
--- a/tests/cond-basic.test
+++ b/tests/cond-basic.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +37,7 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^@TEST_TRUE@target: true' Makefile.in
-grep '^@TEST_TRUE@     action' Makefile.in
+grep "^@TEST_TRUE@${tab}action" Makefile.in
 grep '^@TEST_FALSE@target: false' Makefile.in
 
 :

diff --git a/tests/cond43.test b/tests/cond43.test
index aafb46bfe2cbaeba922fbd28b7a8160f0e84281b..6a3051142691ed1b58f7df88c76f278fc4c3e0d7 100755 (executable)
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ cat >>configure.in <<'END'
 AM_CONDITIONAL([COND1], [:])
 AM_CONDITIONAL([COND2], [:])
 AM_COND_IF([COND1],
-          AM_COND_IF([COND2], [:])
+           AM_COND_IF([COND2], [:])
 )
 AC_OUTPUT
 END
@@ -34,8 +34,8 @@ AUTOMAKE_fails
 $EGREP '^configure\.in:7:.* missing m4 quoting.*macro depth 2( |$)' stderr
 
 sed '/.AM_COND_IF/{
-       s/^/[/
-       s/$/]/
+        s/^/[/
+        s/$/]/
      }' < configure.in > configure.int
 mv -f configure.int configure.in
 rm -rf autom4te*.cache

diff --git a/tests/depend5.test b/tests/depend5.test
index 9d1bb415197e2d1f4538945867a2d4a1a5225747..a2fe5517443137538d38bf814eb81821fa0de410 100755 (executable)
--- a/tests/depend5.test
+++ b/tests/depend5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -74,4 +74,5 @@ do
     test -d $depdir || Exit 1
   fi
 done
+
 :

diff --git a/tests/depend6.test b/tests/depend6.test
index d75a4a6282e90fa178d499be620918ce001e4e31..57a727893c8ccb9854999f6e20ba5a3806421499 100755 (executable)
--- a/tests/depend6.test
+++ b/tests/depend6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,4 +42,5 @@ $AUTOCONF
 }
 cat stderr >&2
 grep shift stderr && Exit 1
+
 :

diff --git a/tests/destdir.test b/tests/destdir.test
index 0633ce215f85c7f9b1fa786683e9735607ca392a..8fefbc27e40f086f9906c2651bc5c80a6204b2a4 100755 (executable)
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,4 +46,5 @@ $AUTOCONF
 $AUTOMAKE -a
 ./configure
 $MAKE distcheck && Exit 1
+
 :

diff --git a/tests/dist-formats.tap b/tests/dist-formats.tap
index 24d595533f0ed1a14edc26cfd8614e91f05047c9..431feaa7979e04cfc29d7380cf4df4fc84b2dedc 100755 (executable)
--- a/tests/dist-formats.tap
+++ b/tests/dist-formats.tap
@@ -79,13 +79,13 @@ missing_compressors=`
   for c in $all_compressors; do
     case $c in
       # Assume gzip(1) is available on every reasonable portability target.
-      gzip)     continue;;
+      gzip) continue;;
       # On Cygwin, as of 9/2/2012, 'compress' is provided by sharutils
       # and is just a dummy script that is not able to actually compress
       # (it can only decompress).  So, check that the 'compress' program
       # is actually able to compress input.
       compress) $c -c </dev/null >/dev/null && continue;;
-      *)        $c --version </dev/null >&2 && continue;;
+      *) $c --version </dev/null >&2 && continue;;
     esac
     echo $c
   done | tr "$nl" ' '`

diff --git a/tests/fort2.test b/tests/fort2.test
index b3c994c17452ddc7c32cb457d69554e2c8380659..d118c1013ab9ff1dee350f45b034b79dd6dd2225 100755 (executable)
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010, 2011, 2012 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -58,4 +59,5 @@ grep '^[      ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && Exit 1
 grep '^[       ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && Exit 1
 grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && Exit 1
 grep '^[       ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && Exit 1
+
 :

diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index eaf2981a1fb3c848037a5d75185993e59e60aba3..6b8aa189c4b65b8f60aa2c05d5a59c434ee40a57 100755 (executable)
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,4 +55,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
index 5cfbf0436e52170552dd15beb518f9dc2fd32148..9187b92fa0964226b067050c12e4076af7d9ac15 100755 (executable)
--- a/tests/instdir-lisp.test
+++ b/tests/instdir-lisp.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,4 +53,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/instdir-python.test b/tests/instdir-python.test
index 21b550ebbb7ceb71822382fcd077e08228db8ed0..3293f6917f5fc6605d8ae6eb36f87ae44dd4db90 100755 (executable)
--- a/tests/instdir-python.test
+++ b/tests/instdir-python.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -57,4 +57,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/instdir.test b/tests/instdir.test
index 89e7950452822546c5eb34908b17c911867db50f..f38394ec7ab38caafa3c119d734c4c916c62a4ba 100755 (executable)
--- a/tests/instdir.test
+++ b/tests/instdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -66,4 +66,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/instdir2.test b/tests/instdir2.test
index fd9ab0579f1b650e11d473e478896edd0e4c5be1..e764d7d6a7916bcaed4800634d3915a85cd71798 100755 (executable)
--- a/tests/instdir2.test
+++ b/tests/instdir2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,4 +88,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index 506ae8ddda4584885afa5a55b772b6421e8a5755..dd8f63c3319473109562897977c9ae843be1ebdc 100755 (executable)
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,4 +65,5 @@ mv -f t Makefile.am
 
 $AUTOMAKE
 grep ' -rpath \$(libdir)/sub' Makefile.in
+
 :

diff --git a/tests/missing.test b/tests/missing.test
index 8e080eb59424ede853595da0a10c9081fc0ba0e2..0ca5786fd6678c331519314545469bb2b944c666 100755 (executable)
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2011 Free Software
+# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2011, 2012 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -63,4 +63,5 @@ $MAKE
 $sleep
 touch aclocal.m4
 $MAKE && Exit 1
+
 :

diff --git a/tests/missing2.test b/tests/missing2.test
index 9844958a7d9753fbab4e4a88ba966c72aea49cf3..5df575e3d8dc648fe99f38a4d025e4a17c1ab1fd 100755 (executable)
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2006, 2007, 2011, 2012 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,4 +55,5 @@ $MAKE
 $sleep
 touch v.m4
 $MAKE && Exit 1
+
 :

diff --git a/tests/nodef.test b/tests/nodef.test
index cfcea397197f2750dc6a13c4bab16a81a91ac6bc..e8389a02c597b9d3687b916720c61c6dffd82979 100755 (executable)
--- a/tests/nodef.test
+++ b/tests/nodef.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -54,4 +54,5 @@ $AUTOCONF
 ./configure
 
 grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
+
 :

diff --git a/tests/nodef2.test b/tests/nodef2.test
index 337c65f3eb7543461813377c379a2271b1d49875..4b5a431a9f5216f3314466adf656d3c851a0e692 100755 (executable)
--- a/tests/nodef2.test
+++ b/tests/nodef2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,4 +50,5 @@ $AUTOMAKE   # Dummy call to make sure Automake grok `no-define' silently.
 ./configure
 
 grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
+
 :

diff --git a/tests/nodep2.test b/tests/nodep2.test
index 840858e3cde9e2d89ed7cd5a505c8aafa27f5f1c..f45ee2cc5ec2f0d52fe7377ac7a6fe8e6b7605bb 100755 (executable)
--- a/tests/nodep2.test
+++ b/tests/nodep2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,15 +36,9 @@ AM_PROG_UPC
 AC_OUTPUT
 END
 
-: > a.c
-: > b.cpp
-: > c.m
-: > d.S
-: > e.java
-: > f.upc
-
 $ACLOCAL
 $AUTOMAKE
 
 grep DEPMODE Makefile.in && Exit 1
+
 :

diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index dea002399726e8df2d7dd37b11accbc78daa08b2..394e6d339e8a25e2c6496584f17beee3922e3f36 100755 (executable)
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 2004, 2010, 2011, 2012 Free
+# Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^@CHECK_TRUE@data_DATA = zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$' Makefile.in
-grep '^@CHECK_TRUE@    doz$' Makefile.in
+grep "^@CHECK_TRUE@${tab}doz$" Makefile.in
 
 grep '^@CHECK_FALSE@data_DATA = dog$' Makefile.in
 

diff --git a/tests/subobjname.test b/tests/subobjname.test
index 3f6f8a0a273c8fde0f456f348f7c7d3d1b284d39..e585141d347fb4b2fb1b84e4647a7cf9e9763d59 100755 (executable)
--- a/tests/subobjname.test
+++ b/tests/subobjname.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2010, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,12 +60,12 @@ grep '^am_d_OBJECTS = ' Makefile.in
 
 # Now the actual test.  Are both values equal?
 cobj=`sed -n '/^am_c_OBJECTS = / {
-               s/.* = \(.*\)$/\1/
-               p
+                s/.* = \(.*\)$/\1/
+                p
               }' Makefile.in`
 dobj=`sed -n '/^am_d_OBJECTS = / {
-               s/^.* = \(.*\)$/\1/
-               p
+                s/^.* = \(.*\)$/\1/
+                p
               }' Makefile.in`
 test "$cobj" = "$dobj"
 

diff --git a/tests/subst4.test b/tests/subst4.test
index ffa2b3ad9371f4b2234b3de7f0f46d0315b6282c..b86a20e5fdc8c16822c29a5f923ecc12adce1567 100755 (executable)
--- a/tests/subst4.test
+++ b/tests/subst4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,4 +40,5 @@ $AUTOMAKE
 ./configure
 $MAKE foo
 test -f foo
+
 :

diff --git a/tests/werror3.test b/tests/werror3.test
index 33ad6f7267dc731391a13505cf165309a3460d33..86e39ec28ef96a6acf2d8be9eca7d19055536357 100755 (executable)
--- a/tests/werror3.test
+++ b/tests/werror3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,4 +44,5 @@ AUTOMAKE_JOBS=2
 export AUTOMAKE_JOBS
 AUTOMAKE_run -Wno-error
 grep 'VAR multiply defined' stderr
+
 :