[Top][All Lists]
[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: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-17-g1e99874 |
|
Date: |
Sun, 24 May 2009 14:43:47 +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=1e9987417d55fa277d8f3b379321fc76f18c49af
The branch, branch-1.11 has been updated
via 1e9987417d55fa277d8f3b379321fc76f18c49af (commit)
via 88eb57b776b5709f16fe10bc76c5f20bc0a62414 (commit)
via 218e678b571d804388c7a8726544c170e49c0d03 (commit)
from e62f05ae7df883045e94d4fe090cc14204605667 (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 1e9987417d55fa277d8f3b379321fc76f18c49af
Merge: e62f05ae7df883045e94d4fe090cc14204605667
88eb57b776b5709f16fe10bc76c5f20bc0a62414
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 24 16:43:23 2009 +0200
Merge branch 'maint' into branch-1.11
commit 88eb57b776b5709f16fe10bc76c5f20bc0a62414
Author: Jack Kelly <address@hidden>
Date: Sun May 24 16:38:33 2009 +0200
AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
* tests/gcj6.test: New test.
* tests/Makefile.am: Update; mark gcj6.test as XFAIL.
* THANKS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 218e678b571d804388c7a8726544c170e49c0d03
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 24 09:03:00 2009 +0200
parallel-tests: avoid GNU make 3.80 substitution bug.
* lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
`.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
to work around GNU make 3.80 substitution reference issue with
trailing white space in the variable.
* tests/parallel-tests10.test: New test.
* tests/parallel-tests6.test: Update comment.
* tests/Makefile.am: Update.
* NEWS: Update.
Report by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 21 ++++++++++++
NEWS | 5 +++
THANKS | 1 +
lib/Automake/tests/Makefile.in | 9 +++--
lib/am/check.am | 9 +++--
tests/Makefile.am | 3 ++
tests/Makefile.in | 12 +++++--
tests/{check11.test => gcj6.test} | 34 ++++++++++----------
...{parallel-tests6.test => parallel-tests10.test} | 20 +++++++-----
tests/parallel-tests6.test | 1 +
10 files changed, 78 insertions(+), 37 deletions(-)
copy tests/{check11.test => gcj6.test} (66%)
copy tests/{parallel-tests6.test => parallel-tests10.test} (82%)
diff --git a/ChangeLog b/ChangeLog
index 61e2917..7ed6854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2009-05-24 Jack Kelly <address@hidden> (tiny change)
+ Ralf Wildenhues <address@hidden>
+
+ AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
+ * tests/gcj6.test: New test.
+ * tests/Makefile.am: Update; mark gcj6.test as XFAIL.
+ * THANKS: Update.
+
+2009-05-24 Ralf Wildenhues <address@hidden>
+
+ parallel-tests: avoid GNU make 3.80 substitution bug.
+ * lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
+ `.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
+ to work around GNU make 3.80 substitution reference issue with
+ trailing white space in the variable.
+ * tests/parallel-tests10.test: New test.
+ * tests/parallel-tests6.test: Update comment.
+ * tests/Makefile.am: Update.
+ * NEWS: Update.
+ Report by Bob Friesenhahn.
+
2009-05-23 Ralf Wildenhues <address@hidden>
testsuite: unset installation directory variables.
diff --git a/NEWS b/NEWS
index 48873d0..c3bb3ab 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ New in 1.11.0a:
Bugs fixed in 1.11.0a:
+* Bugs introduced by 1.11:
+
+ - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+ trailing white space in the test list (`TESTS = foo $(EMPTY)').
+
* Long standing bugs:
- On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
diff --git a/THANKS b/THANKS
index 6f6598e..852f244 100644
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Ian Lance Taylor address@hidden
ÐлÑÑ Ð. ÐолÑбев address@hidden
Imacat address@hidden
Inoue address@hidden
+Jack Kelly address@hidden
James Amundson address@hidden
James Henstridge address@hidden
James R. Van Zandt address@hidden
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 2af1377..994783f 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -386,10 +386,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/lib/am/check.am b/lib/am/check.am
index 8c085d0..b1d1aad 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -234,10 +234,11 @@ check-TESTS:
## cannot use `$?' to compute the set of lazily rerun tests, lest
## we rely on .PHONY to work portably.
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
AM_RECURSIVE_TARGETS += check
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d5a290..62529a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ XFAIL_TESTS = \
all.test \
auxdir2.test \
cond17.test \
+gcj6.test \
txinfo5.test
include $(srcdir)/parallel-tests.am
@@ -303,6 +304,7 @@ gcj2.test \
gcj3.test \
gcj4.test \
gcj5.test \
+gcj6.test \
getopt.test \
gettext.test \
gettext2.test \
@@ -502,6 +504,7 @@ parallel-tests6.test \
parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
+parallel-tests10.test \
parse.test \
percent.test \
percent2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 743fa50..7eccd1f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -229,6 +229,7 @@ XFAIL_TESTS = \
all.test \
auxdir2.test \
cond17.test \
+gcj6.test \
txinfo5.test
parallel_tests = \
@@ -536,6 +537,7 @@ gcj2.test \
gcj3.test \
gcj4.test \
gcj5.test \
+gcj6.test \
getopt.test \
gettext.test \
gettext2.test \
@@ -735,6 +737,7 @@ parallel-tests6.test \
parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
+parallel-tests10.test \
parse.test \
percent.test \
percent2.test \
@@ -1129,10 +1132,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/tests/check11.test b/tests/gcj6.test
similarity index 66%
copy from tests/check11.test
copy to tests/gcj6.test
index d3118a7..be5f49c 100755
--- a/tests/check11.test
+++ b/tests/gcj6.test
@@ -14,40 +14,40 @@
# 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 skip summary.
+# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
+required='gcj'
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
+AM_PROG_GCJ
AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS = skip skip2
+noinst_PROGRAMS = test
+test_SOURCES = Test.java
+test_LDFLAGS = --main=Test
END
-cat >>skip <<'END'
-#! /bin/sh
-exit 77
+cat >Test.java << 'END'
+public class Test {
+ public static void main(String[] argv) {
+ System.out.println("Hello, automake!");
+ }
+}
END
-chmod a+x skip
-cp skip skip2
$ACLOCAL
+$AUTOMAKE
$AUTOCONF
-$AUTOMAKE -a
-
-unset TESTS || :
-
./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
-grep '1.*passed' stdout && Exit 1
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
-grep '2.*passed' stdout && Exit 1
+# These fail without e.g., AC_PROG_CC.
+$MAKE
+grep "OBJEXT = " Makefile
+grep "EXEEXT = " Makefile
:
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests10.test
similarity index 82%
copy from tests/parallel-tests6.test
copy to tests/parallel-tests10.test
index 50f6c44..2642c7a 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests10.test
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check parallel-tests features:
-# - empty TESTS
-# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
+# - trailing whitespace in TESTS
+# GNU make 3.80 may expand trailing white space to `.log'.
. ./defs-p || Exit 1
set -e
@@ -26,18 +26,22 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS =
+TESTS = foo $(BAR)
+BAR =
END
+cat >foo <<'END'
+#! /bin/sh
+exit 0
+END
+
+chmod +x ./foo
+
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '0 tests' stdout
+$MAKE check
Exit 0
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index 50f6c44..5dbb433 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -17,6 +17,7 @@
# Check parallel-tests features:
# - empty TESTS
# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
+# See parallel-tests10.test for a similar issue.
. ./defs-p || Exit 1
set -e
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-17-g1e99874,
Ralf Wildenhues <=