[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-657-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-657-g882972f |
|
Date: |
Sun, 16 Jan 2011 17:06:37 +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=882972f8e2699b5dacc4892ecda43f17d8c1b558
The branch, master has been updated
via 882972f8e2699b5dacc4892ecda43f17d8c1b558 (commit)
via a205290825e78479e4202350da867e2efac7b2a9 (commit)
via 080efc945a834569156c2fc11e7623853e1bdd04 (commit)
via 87073880107cef3f162305b8681f1cb4826ce623 (commit)
via ef46fa2f5ad4152075892ec4f6951bf2c918a8b0 (commit)
from 5e706943089ea0d1a9563572d6cf6d869ca0b889 (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 882972f8e2699b5dacc4892ecda43f17d8c1b558
Merge: a205290 ef46fa2
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jan 16 18:03:08 2011 +0100
Merge branch 'tests-vartypo-fixes'
* tests-vartypo-fixes:
tests: avoid failing command substitution in errexit mode.
commit a205290825e78479e4202350da867e2efac7b2a9
Merge: 5e70694 080efc9
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jan 16 18:02:51 2011 +0100
Merge branch 'maint'
commit ef46fa2f5ad4152075892ec4f6951bf2c918a8b0
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jan 16 14:17:38 2011 +0100
tests: avoid failing command substitution in errexit mode.
* tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
a command substitution with a nonzero exit status, that causes
IRIX and Tru64/OSF sh to fail the whole test.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 22 ++++++++
NEWS | 6 ++-
README | 2 +-
lib/Automake/tests/Makefile.in | 7 ++-
lib/am/check.am | 11 ++--
tests/Makefile.am | 1 +
tests/Makefile.in | 8 ++-
...ts4.test => parallel-tests-unreadable-log.test} | 54 ++++++++-----------
tests/vartypo2.test | 2 +-
tests/vartypos.test | 3 +-
10 files changed, 70 insertions(+), 46 deletions(-)
copy tests/{parallel-tests4.test => parallel-tests-unreadable-log.test} (56%)
diff --git a/ChangeLog b/ChangeLog
index dba98e4..0bb2f69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-01-16 Ralf Wildenhues <address@hidden>
+
+ tests: avoid failing command substitution in errexit mode.
+ * tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
+ a command substitution with a nonzero exit status, that causes
+ IRIX and Tru64/OSF sh to fail the whole test.
+
+2011-01-16 Ralf Wildenhues <address@hidden>
+ Stefano Lattarini <address@hidden>
+
+ parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
+ * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
+ Test file readability before redirecting input from it, to avoid
+ exiting Tru64/OSF 5.1 sh which treats read as special builtin.
+ * tests/parallel-tests-unreadable-log.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+ * NEWS: Update.
+
+2011-01-16 Ralf Wildenhues <address@hidden>
+
+ * NEWS, README: Update copyright years.
+
2011-01-15 Stefano Lattarini <address@hidden>
tests: hard error in case of internal failures or signal caught
diff --git a/NEWS b/NEWS
index bbc177d..a5dc93f 100644
--- a/NEWS
+++ b/NEWS
@@ -117,6 +117,9 @@ Bugs fixed in 1.11a:
AUTOMAKE_OPTIONS = -Wall --foreign
will cause the warnings in category `portability' to be enabled, even
if those warnings are by default disabled in `foreign' strictness.
+
+ - The parallel-tests driver now does not produce erroneous results
+ with Tru64/OSF 5.1 sh upon unreadable log files any more.
New in 1.11:
@@ -1589,7 +1592,8 @@ New in 0.20:
-----
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
diff --git a/README b/README
index de361be..eb49e71 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ address@hidden if you want to receive them.
-----
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003
+Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003, 2008, 2009, 2011
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index ba1017f..da92880 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -347,7 +347,8 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__sh_e_setup); \
list='$(TEST_LOGS)'; \
results=`for f in $$list; do \
- read line < $$f && echo "$$line" || echo FAIL; \
+ test -r $$f && read line < $$f && echo "$$line" \
+ || echo FAIL; \
done`; \
all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[
]*//'`; \
fail=`echo "$$results" | grep -c '^FAIL'`; \
@@ -396,7 +397,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
echo ".. contents:: :depth: 2"; \
echo; \
for f in $$list; do \
- read line < $$f; \
+ test -r $$f && read line < $$f || line=; \
case $$line in \
PASS:*|XFAIL:*);; \
*) echo; cat $$f;; \
@@ -460,7 +461,7 @@ recheck recheck-html:
list='$(TEST_LOGS)'; \
list=`for f in $$list; do \
test -f $$f || continue; \
- if read line < $$f; then \
+ if test -r $$f && read line < $$f; then \
case $$line in FAIL*|XPASS*) echo $$f;; esac; \
else echo $$f; fi; \
done | tr '\012\015' ' '`; \
diff --git a/lib/am/check.am b/lib/am/check.am
index c953be8..5728081 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010, 2011 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
@@ -146,7 +146,8 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__sh_e_setup); \
list='$(TEST_LOGS)'; \
results=`for f in $$list; do \
- read line < $$f && echo "$$line" || echo FAIL; \
+ test -r $$f && read line < $$f && echo "$$line" \
+ || echo FAIL; \
done`; \
all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[
]*//'`; \
fail=`echo "$$results" | grep -c '^FAIL'`; \
@@ -195,7 +196,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
echo ".. contents:: :depth: 2"; \
echo; \
for f in $$list; do \
- read line < $$f; \
+ test -r $$f && read line < $$f || line=; \
case $$line in \
PASS:*|XFAIL:*);; \
*) echo; cat $$f;; \
@@ -287,7 +288,7 @@ recheck recheck-html:
list='$(TEST_LOGS)'; \
list=`for f in $$list; do \
test -f $$f || continue; \
- if read line < $$f; then \
+ if test -r $$f && read line < $$f; then \
case $$line in FAIL*|XPASS*) echo $$f;; esac; \
else echo $$f; fi; \
done | tr '\012\015' ' '`; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb7f712..a9672ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -681,6 +681,7 @@ parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
parallel-tests10.test \
+parallel-tests-unreadable-log.test \
parse.test \
percent.test \
percent2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ac88261..fbcf6b8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -944,6 +944,7 @@ parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
parallel-tests10.test \
+parallel-tests-unreadable-log.test \
parse.test \
percent.test \
percent2.test \
@@ -1303,7 +1304,8 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__sh_e_setup); \
list='$(TEST_LOGS)'; \
results=`for f in $$list; do \
- read line < $$f && echo "$$line" || echo FAIL; \
+ test -r $$f && read line < $$f && echo "$$line" \
+ || echo FAIL; \
done`; \
all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[
]*//'`; \
fail=`echo "$$results" | grep -c '^FAIL'`; \
@@ -1352,7 +1354,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
echo ".. contents:: :depth: 2"; \
echo; \
for f in $$list; do \
- read line < $$f; \
+ test -r $$f && read line < $$f || line=; \
case $$line in \
PASS:*|XFAIL:*);; \
*) echo; cat $$f;; \
@@ -1416,7 +1418,7 @@ recheck recheck-html:
list='$(TEST_LOGS)'; \
list=`for f in $$list; do \
test -f $$f || continue; \
- if read line < $$f; then \
+ if test -r $$f && read line < $$f; then \
case $$line in FAIL*|XPASS*) echo $$f;; esac; \
else echo $$f; fi; \
done | tr '\012\015' ' '`; \
diff --git a/tests/parallel-tests4.test
b/tests/parallel-tests-unreadable-log.test
similarity index 56%
copy from tests/parallel-tests4.test
copy to tests/parallel-tests-unreadable-log.test
index a24bd51..6ebb2b6 100755
--- a/tests/parallel-tests4.test
+++ b/tests/parallel-tests-unreadable-log.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011 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
@@ -14,54 +14,46 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check parallel-tests features:
-# - suffix rules
+# Check that the testsuite driver copes well with unreadable test logs.
parallel_tests=yes
. ./defs || Exit 1
+
cat >> configure.in << 'END'
-AC_PROG_CC
AC_OUTPUT
END
cat > Makefile.am << 'END'
-## Note that automake should not match the '/test' part
-## of 'sub/test' as '.test' suffix.
-TESTS = foo.chk bar.test $(check_PROGRAMS) sub/test
-check_PROGRAMS = baz bla.test bli.suff
-TEST_EXTENSIONS = .chk .test
+TESTS = foo.test bar.test
+XFAIL_TESTS = bar.test
END
-mkdir sub
-
-cat >foo.chk << 'END'
+cat > foo.test << 'END'
#! /bin/sh
exit 0
END
-chmod a+x foo.chk
-cp foo.chk bar.test
-cp foo.chk sub/test
-
-cat >baz.c << 'END'
-int main (void)
-{
- return 0;
-}
+cat > bar.test << 'END'
+#! /bin/sh
+exit 1
END
-cp baz.c bla.c
-cp baz.c bli.c
+chmod a+x foo.test bar.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
+# The testsuite driver will use this variable, so ensure it sanitizes
+# it and do not allow in spurious values from the environment.
+line=PASS; export line
+
./configure
-$MAKE
-$MAKE check
-test -f foo.log
-test -f bar.log
-test -f baz.log
-test -f bla.log
-test -f bli.suff.log
-test -f sub/test.log
+
+$MAKE foo.log
+$MAKE bar.log
+chmod a-r foo.log bar.log
+$MAKE test-suite.log >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^2 of 2 tests failed *$' stdout
+grep '^2 of 2 tests failed\. *$' test-suite.log
+
:
diff --git a/tests/vartypo2.test b/tests/vartypo2.test
index a212c2b..f811bbc 100755
--- a/tests/vartypo2.test
+++ b/tests/vartypo2.test
@@ -53,7 +53,7 @@ AUTOMAKE_fails --add-missing
# Makefile.am:5: library has `libfoo_la' as canonical name (possible typo)
-test -z "`grep 'as canonical' stderr | grep -v ' .libfoo_la. '`"
+grep 'as canonical' stderr | grep -v ' .libfoo_la. ' && Exit 1
test `grep 'variable.*is defined but' stderr | wc -l` = 6
# If we add a global -Wnone, all warnings should disappear.
diff --git a/tests/vartypos.test b/tests/vartypos.test
index fe4f8e6..03747ed 100755
--- a/tests/vartypos.test
+++ b/tests/vartypos.test
@@ -71,7 +71,8 @@ AUTOMAKE_fails
# Makefile.am:13: warning: variable `libfoo_a_DEPENDENCIES' is defined but no
program or
# Makefile.am:13: library has `libfoo_a' as canonical name (possible typo)
-test -z "`grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v '
.libfoo_a. '`"
+grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \
+ && Exit 1
test `grep 'variable.*is defined but' stderr | wc -l` = 13
# If we add a global -Wnone, all warnings should disappear.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-657-g882972f,
Ralf Wildenhues <=