automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-211-g59c9e6d
Date: Fri, 17 Sep 2010 10:18:34 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=59c9e6dee679dc8fa67cac29dadf4672c8b0938e

The branch, branch-1.11 has been updated
       via  59c9e6dee679dc8fa67cac29dadf4672c8b0938e (commit)
       via  e09f00c8aada78d19c199bb6f7743330dc086afa (commit)
       via  fd7d4da2cb4d4817776fd6b8637060f5351134e3 (commit)
       via  59db71ca887b2cc5b84eb05d1abeb588d3bfea47 (commit)
       via  adf64b4bfdc8e58ff9d3f927ded85b2329cb6bb6 (commit)
      from  434a335eae0c5300997df46c39218bf133f6b88e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59c9e6dee679dc8fa67cac29dadf4672c8b0938e
Merge: 434a335 e09f00c
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 17 12:10:50 2010 +0200

    Merge branch 'maint' into branch-1.11

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                  |   25 ++++++++++++
 HACKING                                    |   16 ++++---
 tests/Makefile.am                          |   10 +++++
 tests/Makefile.in                          |   10 +++++
 tests/README                               |    4 +-
 tests/{condhook2.test => help-depend.test} |   34 ++++++----------
 tests/{colon2.test => help-depend2.test}   |   25 ++++++------
 tests/{mdate6.test => help-dmalloc.test}   |   24 +++++++-----
 tests/{colon2.test => help-init.test}      |   22 +++++------
 tests/{mdate6.test => help-lispdir.test}   |   25 +++++++-----
 tests/help-maintainer.test                 |   58 ++++++++++++++++++++++++++++
 tests/{mdate6.test => help-multilib.test}  |   23 ++++++-----
 tests/{mdate6.test => help-regex.test}     |   23 ++++++-----
 tests/{all2.test => help-silent.test}      |   25 ++++++++----
 tests/{mdate6.test => help-upc.test}       |   23 ++++++-----
 tests/mmode.test                           |    5 +-
 16 files changed, 238 insertions(+), 114 deletions(-)
 copy tests/{condhook2.test => help-depend.test} (61%)
 copy tests/{colon2.test => help-depend2.test} (59%)
 copy tests/{mdate6.test => help-dmalloc.test} (68%)
 copy tests/{colon2.test => help-init.test} (68%)
 copy tests/{mdate6.test => help-lispdir.test} (64%)
 create mode 100755 tests/help-maintainer.test
 copy tests/{mdate6.test => help-multilib.test} (69%)
 copy tests/{mdate6.test => help-regex.test} (70%)
 copy tests/{all2.test => help-silent.test} (56%)
 copy tests/{mdate6.test => help-upc.test} (67%)

diff --git a/ChangeLog b/ChangeLog
index e6472e5..37bfb26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2010-09-15  Stefano Lattarini  <address@hidden>
+
+       Test automake-generated portions of configure help screen.
+       * tests/help-depend.test: New test.
+       * tests/help-depend2.test: Likewise.
+       * tests/help-dmalloc.test: Likewise.
+       * tests/help-init.test: Likewise.
+       * tests/help-lispdir.test: Likewise.
+       * tests/help-maintainer.test: Likewise.
+       * tests/help-multilib.test: Likewise.
+       * tests/help-regex.test: Likewise.
+       * tests/help-silent.test: Likewise.
+       * tests/help-upc.test: Likewise.
+       * tests/mmode.test: Remove tests on `configure --help' output,
+       they are supersed by tests in `help-maintainer.test'.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-09-14  Stefano Lattarini  <address@hidden>
+
+       * tests/README: Don't put GCS mandated tools in $required.
+
+2010-09-13  Ralf Wildenhues  <address@hidden>
+
+       * HACKING: Hint at old commits with `git describe' output.
+
 2010-09-12  Stefano Lattarini  <address@hidden>
 
        Fix regression in test `colon4.test'.
diff --git a/HACKING b/HACKING
index d9b2099..a3e37f0 100644
--- a/HACKING
+++ b/HACKING
@@ -33,16 +33,16 @@
   Most of them are updated before release with `make fetch'.
 
 * Changes other than bug fixes must be mentioned in NEWS.  Important
-  bug fixes should be mentioned in NES, too.
+  bug fixes should be mentioned in NEWS, too.
 
 ================================================================
 = Naming
 
 * We've adopted the convention that internal AC_SUBSTs should be
-  named with a leading `am__', and internally generated targets should
-  be named with a leading `am--'.  This convention is very new
-  (as of Feb 7 2001) and so it isn't yet universally used.  But all
-  new code should use it.
+  named with a leading `am__', and internally generated targets
+  should be named with a leading `am--'.  This convention, although
+  in place from at least February 2001, isn't yet universally used.
+  But all new code should use it.
 
   We used to use `_am_' as the prefix for an internal AC_SUBST.
   However, it turns out that NEWS-OS 4.2R complains if a Makefile
@@ -98,8 +98,8 @@
   not installed as "autoconf", pass it explicitly (along with the
   accompanying "autom4te") when calling `bootstrap' and `configure'.
   For example:
-    $ AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65 ./bootstrap
-    $ ./configure AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65
+    $ AUTOCONF=autoconf2.67 AUTOM4TE=autom4te2.67 ./bootstrap
+    $ ./configure AUTOCONF=autoconf2.67 AUTOM4TE=autom4te2.67
 
 * Dependent files aclocal.m4, configure and Makefile.in in all
   directories should be up to date in the git repository, so that
@@ -143,6 +143,8 @@
   the active branches descending from the buggy commit.  This offers a
   simple way to fix the bug consistently and effectively.
 
+* When referring to older commits, use 'git describe' output as pointer.
+
 * There may be a number of longer-lived feature branches for new developments.
   They should be based off of a common ancestor of all active branches to
   which the feature should be merged later.  The next branch may serve as
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58103cc..ba695f5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -348,6 +348,16 @@ gnits2.test \
 gnits3.test \
 header.test \
 help.test \
+help-depend.test \
+help-depend2.test \
+help-dmalloc.test \
+help-init.test \
+help-lispdir.test \
+help-maintainer.test \
+help-multilib.test \
+help-regex.test \
+help-silent.test \
+help-upc.test \
 hfs.test \
 hosts.test \
 implicit.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c707417..9020096 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -586,6 +586,16 @@ gnits2.test \
 gnits3.test \
 header.test \
 help.test \
+help-depend.test \
+help-depend2.test \
+help-dmalloc.test \
+help-init.test \
+help-lispdir.test \
+help-maintainer.test \
+help-multilib.test \
+help-regex.test \
+help-silent.test \
+help-upc.test \
 hfs.test \
 hosts.test \
 implicit.test \
diff --git a/tests/README b/tests/README
index 7d74083..a063348 100644
--- a/tests/README
+++ b/tests/README
@@ -93,7 +93,9 @@ Do
   Cite the PR number (if any), and the original reporter (if any), so
   we can find or ask for information if needed.
 
-  Use `required=...' for required tools.
+  Use `required=...' for required tools.  Do not explicitly require
+  tools which can be taken for granted because they're listed in the
+  GNU Coding Standards (for example, `gzip').
 
   Include ./defs in every test script (see existing tests for examples
   of how to do this).
diff --git a/tests/condhook2.test b/tests/help-depend.test
similarity index 61%
copy from tests/condhook2.test
copy to tests/help-depend.test
index 45e2d43..ed9447e 100755
--- a/tests/condhook2.test
+++ b/tests/help-depend.test
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,36 +14,28 @@
 # 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 install when a conditional install-*-hook is defined.
-# Keep this in sync with sister test condhook.test.
+# Make sure that our private macro `AM_DEP_TRACK' adds proper text to
+# the configure help screen.
+# Keep this in sync with sister test `help-depend2.test'
 
 . ./defs || Exit 1
 
 set -e
 
-cat >> configure.in << 'END'
-AM_CONDITIONAL([TEST], [true])
-AC_OUTPUT
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_DEP_TRACK
 END
 
-cat > Makefile.am << 'END'
-sysconf_DATA = mumble
-if TEST
-install-data-hook:
-       : > $(top_srcdir)/good
-endif
-END
-
-: > mumble
-
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE
 
-./configure --prefix "`pwd`/inst"
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
 
-$MAKE install
-test -f inst/etc/mumble
-test -f good
+$FGREP ' --enable-dependency-tracking ' stdout
+$FGREP ' --disable-dependency-tracking ' stdout
+$FGREP ' one-time build' stdout
+$FGREP ' slow dependency extract' stdout
 
 :
diff --git a/tests/colon2.test b/tests/help-depend2.test
similarity index 59%
copy from tests/colon2.test
copy to tests/help-depend2.test
index a52dfa8..b4133b4 100755
--- a/tests/colon2.test
+++ b/tests/help-depend2.test
@@ -1,6 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 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
@@ -15,7 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure ":" works with files automake generates.
+# Make sure that when automake automatically activates support for
+# dependency tracking, it adds proper text to the configure help screen.
+# Keep this in sync with sister test `help-depend.test'
 
 . ./defs || Exit 1
 
@@ -24,18 +25,18 @@ set -e
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile:zardoz.in])
-AC_OUTPUT
+AC_PROG_CC
 END
 
-echo 'dummy:' > zardoz.am
-
 $ACLOCAL
-$AUTOMAKE
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
 
-# We actually check several things here.
-test -f zardoz.in
-grep '^zardoz:' zardoz.in && Exit 1
-grep '^dummy:' zardoz.in
+$FGREP ' --enable-dependency-tracking ' stdout
+$FGREP ' --disable-dependency-tracking ' stdout
+$FGREP ' one-time build' stdout
+$FGREP ' slow dependency extract' stdout
 
 :
diff --git a/tests/mdate6.test b/tests/help-dmalloc.test
similarity index 68%
copy from tests/mdate6.test
copy to tests/help-dmalloc.test
index e7f7d69..c20288d 100755
--- a/tests/mdate6.test
+++ b/tests/help-dmalloc.test
@@ -14,22 +14,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# mdate-sh can work with weird file names, doesn't eval too much.
+# Make sure that our macro `AM_WITH_DMALLOC' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_WITH_DMALLOC
+END
 
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
+
+$FGREP ' --with-dmalloc ' stdout
+$FGREP ' use dmalloc' stdout
+$FGREP 'www.dmalloc.com' stdout
 
 :
diff --git a/tests/colon2.test b/tests/help-init.test
similarity index 68%
copy from tests/colon2.test
copy to tests/help-init.test
index a52dfa8..a3af271 100755
--- a/tests/colon2.test
+++ b/tests/help-init.test
@@ -1,6 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 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
@@ -15,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure ":" works with files automake generates.
+# Make sure that our grand macro `AM_INIT_AUTOMAKE' add proper text
+# to the configure help screen.
 
 . ./defs || Exit 1
 
@@ -24,18 +24,16 @@ set -e
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile:zardoz.in])
-AC_OUTPUT
 END
 
-echo 'dummy:' > zardoz.am
-
 $ACLOCAL
-$AUTOMAKE
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
 
-# We actually check several things here.
-test -f zardoz.in
-grep '^zardoz:' zardoz.in && Exit 1
-grep '^dummy:' zardoz.in
+grep ' --program-prefix[= ]' stdout
+grep ' --program-suffix[= ]' stdout
+grep ' --program-transform-name[= ]' stdout
 
 :
diff --git a/tests/mdate6.test b/tests/help-lispdir.test
similarity index 64%
copy from tests/mdate6.test
copy to tests/help-lispdir.test
index e7f7d69..3d82074 100755
--- a/tests/mdate6.test
+++ b/tests/help-lispdir.test
@@ -14,22 +14,27 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# mdate-sh can work with weird file names, doesn't eval too much.
+# Make sure that our macro `AM_PATH_LISPDIR' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_PATH_LISPDIR
+END
 
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
+
+grep ' --with-lispdir .*override.*lisp directory' stdout
+grep ' EMACS .*[eE]macs editor' stdout
+grep ' EMACSLOADPATH' stdout
+grep ' .*[eE]macs library search path' stdout
 
 :
diff --git a/tests/help-maintainer.test b/tests/help-maintainer.test
new file mode 100755
index 0000000..72fc98a
--- /dev/null
+++ b/tests/help-maintainer.test
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro `AM_MAINTAINER_MODE' adds proper text to
+# the configure help screen.
+
+. ./defs || Exit 1
+
+set -e
+
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_MAINTAINER_MODE
+END
+
+cat configure.in
+$ACLOCAL
+$AUTOCONF --force
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' --enable-maintainer-mode.*enable make rules' stdout
+
+rm -rf autom4te*.cache # just to be sure
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in >t
+mv -f t configure.in
+
+cat configure.in
+$ACLOCAL
+$AUTOCONF --force
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' --enable-maintainer-mode.*enable make rules' stdout
+
+rm -rf autom4te*.cache # just to be sure
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in >t
+mv -f t configure.in
+
+cat configure.in
+$ACLOCAL
+$AUTOCONF --force
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' --disable-maintainer-mode.*disable make rules' stdout
+
+:
diff --git a/tests/mdate6.test b/tests/help-multilib.test
similarity index 69%
copy from tests/mdate6.test
copy to tests/help-multilib.test
index e7f7d69..0016c76 100755
--- a/tests/mdate6.test
+++ b/tests/help-multilib.test
@@ -14,22 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# mdate-sh can work with weird file names, doesn't eval too much.
+# Make sure that our macro `AM_ENABLE_MULTILIB' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_ENABLE_MULTILIB
+END
 
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
+
+$FGREP ' --enable-multilib ' stdout
+$FGREP ' many library versions (default)' stdout
 
 :
diff --git a/tests/mdate6.test b/tests/help-regex.test
similarity index 70%
copy from tests/mdate6.test
copy to tests/help-regex.test
index e7f7d69..3eff5f9 100755
--- a/tests/mdate6.test
+++ b/tests/help-regex.test
@@ -14,22 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# mdate-sh can work with weird file names, doesn't eval too much.
+# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_WITH_REGEX
+END
 
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
+
+$FGREP ' --without-regex ' stdout
+$FGREP ' use GNU rx ' stdout
 
 :
diff --git a/tests/all2.test b/tests/help-silent.test
similarity index 56%
copy from tests/all2.test
copy to tests/help-silent.test
index 38b6f8c..b338907 100755
--- a/tests/all2.test
+++ b/tests/help-silent.test
@@ -14,21 +14,30 @@
 # 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 to make sure all-local and other -local targets work correctly.
+# Make sure that our macro `AM_SILENT_RULES' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_SILENT_RULES
+END
+
 $ACLOCAL
 
-targets='all install-exec install-data uninstall'
-for target in $targets; do
-  : Doing $target
-  echo "${target}-local:" > Makefile.am
-  $AUTOMAKE
-  grep "${target}-local ${target}-local" Makefile.in && Exit 1
-  grep "${target}-am:.*${target}-local" Makefile.in
+mv -f configure.in configure.tmpl
+
+for args in '' '([])' '([yes])' '([no])'; do
+  sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.in
+  cat configure.in
+  $AUTOCONF --force
+  ./configure --help >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  grep ' --enable-silent-rules  *less verbose build.*undo.*make V=1' stdout
+  grep ' --disable-silent-rules  *verbose build.*undo.*make V=0' stdout
 done
 
 :
diff --git a/tests/mdate6.test b/tests/help-upc.test
similarity index 67%
copy from tests/mdate6.test
copy to tests/help-upc.test
index e7f7d69..586299b 100755
--- a/tests/mdate6.test
+++ b/tests/help-upc.test
@@ -14,22 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# mdate-sh can work with weird file names, doesn't eval too much.
+# Make sure that our macro `AM_PROG_UPC' adds proper text to
+# the configure help screen.
 
 . ./defs || Exit 1
 
 set -e
 
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_PROG_UPC
+END
 
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
+
+grep ' UPCFLAGS .*Unified Parallel C compiler flags' stdout
+grep ' UPC .*Unified Parallel C compiler command' stdout
 
 :
diff --git a/tests/mmode.test b/tests/mmode.test
index 19f83f1..c5a16c9 100755
--- a/tests/mmode.test
+++ b/tests/mmode.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -31,7 +31,6 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure --help | grep 'enable-maintainer-mode.*enable make rules'
 ./configure
 grep '^MAINT.*#' Makefile
 
@@ -51,7 +50,6 @@ sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in > 
configure.int
 mv -f configure.int configure.in
 $AUTOCONF --force
 
-./configure --help | grep 'disable-maintainer-mode.*disable make rules'
 ./configure
 grep '^MAINT.*#' Makefile && Exit 1
 
@@ -64,4 +62,5 @@ grep '^MAINT.*#' Makefile
 sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.in > configure.int
 mv -f configure.int configure.in
 $AUTOCONF --force -Werror && Exit 1
+
 :


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]