* 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. --- tests/acloca16.test | 3 ++- tests/bsource.test | 3 ++- tests/commen11.test | 7 ++++--- tests/comment7.test | 14 +++++++------- tests/compile_f90_c_cxx.test | 12 ++++++------ tests/compile_f_c_cxx.test | 11 +++++------ tests/cond-basic.test | 5 +++-- tests/cond43.test | 8 ++++---- tests/depend5.test | 3 ++- tests/depend6.test | 3 ++- tests/destdir.test | 3 ++- tests/dist-formats.tap | 4 ++-- tests/fort2.test | 4 +++- tests/instdir-java.test | 3 ++- tests/instdir-lisp.test | 3 ++- tests/instdir-python.test | 3 ++- tests/instdir.test | 3 ++- tests/instdir2.test | 3 ++- tests/ltinstloc.test | 4 +++- tests/missing.test | 3 ++- tests/missing2.test | 5 +++-- tests/nodef.test | 3 ++- tests/nodef2.test | 3 ++- tests/nodep2.test | 10 ++-------- tests/pluseq3.test | 6 +++--- tests/subobjname.test | 10 +++++----- tests/subst4.test | 3 ++- tests/werror3.test | 3 ++- 28 files changed, 80 insertions(+), 65 deletions(-)
diff --git a/tests/acloca16.test b/tests/acloca16.test index 3300856..1d897ed 100755 --- 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 38f8a43..d50c1d5 100755 --- 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 b092d39..f355cc3 100755 --- 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 7d869de..26854a1 100755 --- 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 ec593ca..b38f67d 100755 --- 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 e3b51a4..aaa5abd 100755 --- 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 2866aa6..5a64000 100755 --- 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 aafb46b..6a30511 100755 --- 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 9d1bb41..a2fe551 100755 --- 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 d75a4a6..57a7278 100755 --- 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 0633ce2..8fefbc2 100755 --- 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 24d5955..431feaa 100755 --- 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 b3c994c..d118c10 100755 --- 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 eaf2981..6b8aa18 100755 --- 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 5cfbf04..9187b92 100755 --- 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 21b550e..3293f69 100755 --- 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 89e7950..f38394e 100755 --- 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 fd9ab05..e764d7d 100755 --- 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 506ae8d..dd8f63c 100755 --- 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 8e080eb..0ca5786 100755 --- 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 9844958..5df575e 100755 --- 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 cfcea39..e8389a0 100755 --- 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 337c65f..4b5a431 100755 --- 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 840858e..f45ee2c 100755 --- 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 dea0023..394e6d3 100755 --- 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 3f6f8a0..e585141 100755 --- 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 ffa2b3a..b86a20e 100755 --- 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 33ad6f7..86e39ec 100755 --- 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 + : -- 1.7.7.3