Extend test on `nostdinc' automake option.

* tests/nostdinc.test: Enable `errexit' shell flag.  Related and
unrelated minor changes.  Make the grepping of the generated
Makefile.in slighty stricter.  Generate and run configure, so that
the generated Makefile can be grepped too.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index fdf2970e5c904001bd89edbf03343e3fccd5a2a4..6d40c54a299c146370da17cabcc2165f817b8446 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Extend test on `nostdinc' automake option.
+       * tests/nostdinc.test: Enable `errexit' shell flag.  Related and
+       unrelated minor changes.  Make the grepping of the generated
+       Makefile.in slighty stricter.  Generate and run configure, so that
+       the generated Makefile can be grepped too.
+
 2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Make gnupload portable to EBCDIC hosts.

diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 96e30c5cda717f6fcf66084ab1b422a74b334759..43535ef7795bbeddf1b4358e6ac5776e7b17d30d 100755 (executable)
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -18,8 +18,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
@@ -28,8 +31,23 @@ bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
+
+grep '.*-I *\.' Makefile.in && Exit 1
+
+# We'll test the fully-processed Makefile too.
+$AUTOCONF
+
+# Test with $builddir != $srcdir
+mkdir build
+cd build
+../configure
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+
+# Test with $builddir = $srcdir
+cd ..
+./configure
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
 
-$FGREP -e '-I.' Makefile.in && Exit 1
 Exit 0