[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-225-g8d899ac |
|
Date: |
Wed, 16 May 2012 14:47:19 +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=8d899acbab58dd806deda03862d64cbafff2cb6a
The branch, ng/master has been updated
via 8d899acbab58dd806deda03862d64cbafff2cb6a (commit)
via e77e1977451fff101bb91b71ff363b94b813fb64 (commit)
via e251673828b140ebfcabfc520bfe8c20e0f06e4f (commit)
via d89da9c295ac67ce985270da16f45c4abd1a089a (commit)
via 9c86ba6b75fc09d48e5c8b8c6f1178147430efed (commit)
from 62f2e2d5860aa44d9a70eaef70b130580a3f62a0 (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 8d899acbab58dd806deda03862d64cbafff2cb6a
Merge: e77e197 e251673
Author: Stefano Lattarini <address@hidden>
Date: Wed May 16 15:20:28 2012 +0200
Merge branch 'master' into ng/master
* master:
tests: fix spurious failure due to i18n issue
tests: add few missing 'cc' and 'c++' requirements
-----------------------------------------------------------------------
Summary of changes:
t/lex-clean.sh | 2 +-
t/lex-depend.sh | 2 +-
t/lex-line.sh | 2 +-
t/lex-nodist.sh | 2 +-
t/lex-pr204.sh | 2 +-
t/memoize.tap | 65 ++++++++++++++++++++++++++++++++++++++--
t/parallel-tests-fork-bomb.sh | 5 +++
t/silent-lex.sh | 2 +-
t/silent-yacc-headers.sh | 2 +-
t/silent-yacc.sh | 2 +-
t/yacc-bison-skeleton-cxx.sh | 2 +-
t/yacc-bison-skeleton.sh | 2 +-
t/yacc-clean-cxx.sh | 2 +-
t/yacc-cxx.sh | 2 +-
t/yacc-d-cxx.sh | 2 +-
t/yacc-deleted-headers.sh | 2 +-
t/yacc-depend.sh | 2 +-
t/yacc-depend2.sh | 2 +-
t/yacc-dist-nobuild-subdir.sh | 2 +-
t/yacc-line.sh | 2 +-
t/yacc-mix-c-cxx.sh | 2 +-
21 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 4213195..18cf32e 100755
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -19,7 +19,7 @@
# distributed .l sources are cleaned by "make maintainer-clean".
# See also sister test 'lex-clean-cxx.test'.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index f7cfd6a..a2897ed 100755
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -17,7 +17,7 @@
# Test to make sure automatic dependency tracking work with Lex/C.
# Test suggested by PR automake/6.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 20bd9c8..7737a50 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -19,7 +19,7 @@
# 'subdir-object' option enabled.
# See also sister test 'yacc-line.test'.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 99e6b7b..2e90032 100755
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -20,7 +20,7 @@
# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
# for yacc-generated .c and .h files.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index 2e1b4e3..3ebb572 100755
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -20,7 +20,7 @@
# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
# for yacc-generated .c and .h files.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac <<'EOF'
diff --git a/t/memoize.tap b/t/memoize.tap
index ca7fede..b9188bf 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-plan_ 13
+plan_ 17
ocwd=`pwd` || fatal_ "couldn't get current working directory"
@@ -120,7 +120,7 @@ END
#---------------------------------------------------------------------------
-T "on indirect recursive variable expansion" <<'END'
+T "memoize indirect recursive variable expansion" <<'END'
foo = $(call am__memoize,foo,$(indir))
@@ -134,7 +134,7 @@ END
#---------------------------------------------------------------------------
-T "on indirect immediate variable expansion" <<'END'
+T "memoize indirect immediate variable expansion" <<'END'
foo = $(call am__memoize,foo,$(indir))
@@ -148,7 +148,7 @@ END
#---------------------------------------------------------------------------
-T "on function call" <<'END'
+T "memoize function call (containing builtin calls)" <<'END'
my_func = $(firstword $(sort $(1)))
foo = $(call am__memoize,foo,$(call my_func, 6 3 1 7))
@@ -160,6 +160,47 @@ END
#---------------------------------------------------------------------------
+T "expanded as function argument" <<'END'
+
+foo = $(call am__memoize,foo,bar)
+func = ::$(0)::$(1)::
+
+test:
+ test '$(call func,$(foo))' = ::func::bar::
+ test '$(foo)' = bar
+ # Once more.
+ test '$(call func,$(foo))' = ::func::bar::
+END
+
+#---------------------------------------------------------------------------
+
+T "expanded as function argument (trickier)" <<'END'
+
+foo = $(call am__memoize,foo,zardoz)
+indir_func = ::$($1)::
+
+test:
+ test '$(call indir_func,foo)' = ::zardoz::
+ test '$(foo)' = zardoz
+ # Once more.
+ test '$(call indir_func,foo)' = ::zardoz::
+END
+
+#---------------------------------------------------------------------------
+
+T "expanded into another memoized variable" <<'END'
+
+foo = $(call am__memoize,foo,one $(bar))
+bar = $(call am__memoize,bar,two $(baz))
+baz = $(call am__memoize,baz,$(sort 4 3))
+
+test:
+ test '$(foo)' = 'one two 3 4'
+ test '$(bar)' = 'two 3 4'
+END
+
+#---------------------------------------------------------------------------
+
T "memoization actually takes place (1)" <<'END'
indir := ok
@@ -176,6 +217,22 @@ END
T "memoization actually takes place (2)" <<'END'
+indir := ok
+expand = $(eval expanded-to := $$($1))
+foo = $(call am__memoize,foo,$(indir))
+$(call expand,foo)
+override indir := ko
+
+test:
+ test '$(foo)' = ok
+ test '$(indir)' = ko
+ test '$(expanded-to)' = ok
+END
+
+#---------------------------------------------------------------------------
+
+T "memoization actually takes place (3)" <<'END'
+
foo1 = $(call am__memoize,foo1,$(shell test -f x && echo "+"))
foo2 = $(call am__memoize,foo2,$(shell test -f y || echo "-"))
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 193a6e7..a4e9253 100755
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -21,6 +21,11 @@
am_parallel_tests=yes
. ./defs || Exit 1
+# We don't want localized error messages from make, since we'll have
+# to grep them. See automake bug#11452.
+LANG=C LANGUAGE=C LC_ALL=C
+export LANG LANGUAGE LC_ALL
+
# The tricky part of this test is to avoid that make hangs or even
# freezes the system in case infinite recursion (which is the bug we
# are testing against) is encountered. The following hacky makefile
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 0e7bca5..fa9623c 100755
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode for Lex.
-required=lex
+required='cc lex'
. ./defs || Exit 1
mkdir sub
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index 5f12c18..f272270 100755
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc, when yacc-generated headers are
# involved (i.e., the '-d' option is in *YFLAGS).
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
mkdir sub
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 5cb3abc..4b493b5 100755
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc.
# Keep this in sync with sister test 'silent-yacc-gcc.test'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
mkdir sub
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index 31bec34..c770a85 100755
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -17,7 +17,7 @@
# Test to make sure bison + bison's C++ skeleton + C++ works.
# For Automake bug#7648 and PR automake/491.
-required=bison
+required='c++ bison'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index 147ed83..5cb034c 100755
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -17,7 +17,7 @@
# Test to make sure bison + bison's skeleton works.
# For Automake bug#7648 and PR automake/491.
-required=bison
+required='cc bison'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index ea21bff..d8ee1c6 100755
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -20,7 +20,7 @@
# "make maintainer-clean".
# See also sister test 'yacc-clean.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 246f1ad..a888f87 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -18,7 +18,7 @@
# headers are not involved).
# Keep in sync with sister test 'yacc-basic.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index f1ec2c3..d4c4af2 100755
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -18,7 +18,7 @@
# (i.e., '-d' in *YFLAGS).
# Keep in sync with sister test 'yacc-d-basic.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
write_parse ()
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index 5ab8d87..3ac0254 100755
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
@@ -16,7 +16,7 @@
# Tests that we can recover from deleted headers generated by 'yacc -d'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index 73d64ad..04ddb52 100755
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
@@ -17,7 +17,7 @@
# Make sure depcomp does not needlessly update headers for yacc rules.
# Report from Paolo Bonzini.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index 7b5cd1c..245a946 100755
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -17,7 +17,7 @@
# Make sure depcomp does not needlessly update headers and objects
# for yacc rules.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 5181cb5..94fb07c 100755
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -18,7 +18,7 @@
# using yacc and the automake 'subdir-objects' option.
# Exposes automake bug#8485.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index 86a490d..5468c09 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -19,7 +19,7 @@
# 'subdir-object' option enabled.
# See also sister test 'lex-line.test'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index affd938..a1bc128 100755
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -17,7 +17,7 @@
# Check that many different Yacc parsers (both C and C++) can co-exists
# in the same directory.
-required=yacc
+required='cc c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-225-g8d899ac,
Stefano Lattarini <=