[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-19
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-190-g26b7855 |
|
Date: |
Sat, 27 Oct 2012 10:27:01 +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=26b78559eef83ee5535564c782680f33fd9899f5
The branch, master has been updated
via 26b78559eef83ee5535564c782680f33fd9899f5 (commit)
via d8f47b194d55dfb31a116106032eaf81bdf5656e (commit)
via 078ff407c4b50309c65c7c8eb61d6b08f4d2577e (commit)
via 24bf687ed03f1259dea1f0b6588c9e5c1e57366c (commit)
via 94b639da4aee1f06eb398fb46b60ef8d3e50e0ff (commit)
via 2990f48d423c92f8800f8f50368b6b6d1d1be788 (commit)
via 042a2279fe1d030b0deb559c6318213e3cea1f6f (commit)
via b025bb83eb4442290442c5b070e0f53c0445ea2a (commit)
via 926ab5b475fe77960a81ea608ea1948dc7d3b4b6 (commit)
via 83caec4ed340657634fff930f45d2c9e4d60007c (commit)
via e448fc02db3558219fb0f1a7a1183af77fa90971 (commit)
via e3b0ad32d023b1553235f2cfe4a94e6ae4743825 (commit)
via 3c5c9394e2cbe6f88e0117f34c33b1e03cdaa5bb (commit)
via ae74aa69705e967a19327c70a26c0004843e8e7b (commit)
via 6a0460c49f401a58a9ffff1e65690da90690c002 (commit)
from df23dafc30d54164035281aec1f6ce14d0f4b0fc (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 26b78559eef83ee5535564c782680f33fd9899f5
Merge: df23daf d8f47b1
Author: Stefano Lattarini <address@hidden>
Date: Sat Oct 27 11:57:43 2012 +0200
Merge branch 'maint'
* maint:
depcomp: avoid potential interferences from the environment
depcomp: improve comments about the 'gcc' depmode
sync: update files from upstream with "make fetch"
maintcheck: remove an obsolescent check
tests: rename some tests to more expressive names, again
tests: remove an obsolescent grepping check
tests: merge two tests on automatic remake functionality
tests: rename some test to more expressive names
news: 'compile' supports libfoo.a naming when wrapping Microsoft tools
tests: ensure generation of wrapper tests matching multiple conditions
tests: simplify a loop in gen-testsuite-part
compile: support libfoo.a naming when wrapping Microsoft tools
NEWS: fix wording and grammaros, re-wrap text accordingly
cosmetics: fix typo in 'lib/depcomp' comments
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 21 ++++---
gen-testsuite-part | 59 +++++++++++++------
lib/compile | 7 ++-
lib/config.guess | 4 +-
lib/config.sub | 11 ++--
lib/depcomp | 11 +++-
t/compile4.sh | 8 ---
t/compile6.sh | 10 +++-
t/list-of-tests.mk | 60 ++++++++++----------
t/{parallel-tests.sh => parallel-tests-basics.sh} | 0
...l-tests5.sh => parallel-tests-concurrency-2.sh} | 0
...lel-tests3.sh => parallel-tests-concurrency.sh} | 0
t/{parallel-tests6.sh => parallel-tests-empty.sh} | 2 +-
...=> parallel-tests-generated-and-distributed.sh} | 0
...arallel-tests9.sh => parallel-tests-recheck.sh} | 0
...10.sh => parallel-tests-trailing-whitespace.sh} | 0
t/{remake9c.sh => remake-after-acinclude-m4.sh} | 2 +-
t/{remake9d.sh => remake-after-aclocal-m4.sh} | 2 +-
t/{remake9a.sh => remake-after-configure-ac.sh} | 2 +-
t/{remake9b.sh => remake-after-makefile-am.sh} | 2 +-
t/{remake11.sh => remake-deeply-nested.sh} | 0
t/{remake7.sh => remake-fail.sh} | 0
t/{remake10c.sh => remake-include-aclocal.sh} | 5 +-
t/{remake10a.sh => remake-include-configure.sh} | 5 +-
t/{remake10b.sh => remake-include-makefile.sh} | 6 +-
t/{remake5.sh => remake-maintainer-mode.sh} | 0
t/{remake8a.sh => remake-makefile-intree.sh} | 6 +-
t/{remake8b.sh => remake-makefile-vpath.sh} | 6 +-
t/{remake12.sh => remake-mild-stress.sh} | 0
t/{remake4.sh => remake-not-after-make-dist.sh} | 0
t/{remake.sh => remake-subdir-grepping.sh} | 3 +-
t/{remake3a.sh => remake-subdir-no-makefile.sh} | 1 -
t/{remake1a.sh => remake-subdir-only.sh} | 2 +-
t/{remake6.sh => remake-subdir3.sh} | 0
...emake-timing.sh => remake-timing-bug-pr8365.sh} | 0
t/remake2.sh | 38 ------------
t/remake3.sh | 38 ------------
37 files changed, 137 insertions(+), 174 deletions(-)
rename t/{parallel-tests.sh => parallel-tests-basics.sh} (100%)
rename t/{parallel-tests5.sh => parallel-tests-concurrency-2.sh} (100%)
rename t/{parallel-tests3.sh => parallel-tests-concurrency.sh} (100%)
rename t/{parallel-tests6.sh => parallel-tests-empty.sh} (94%)
rename t/{parallel-tests8.sh => parallel-tests-generated-and-distributed.sh}
(100%)
rename t/{parallel-tests9.sh => parallel-tests-recheck.sh} (100%)
rename t/{parallel-tests10.sh => parallel-tests-trailing-whitespace.sh} (100%)
rename t/{remake9c.sh => remake-after-acinclude-m4.sh} (97%)
rename t/{remake9d.sh => remake-after-aclocal-m4.sh} (97%)
rename t/{remake9a.sh => remake-after-configure-ac.sh} (97%)
rename t/{remake9b.sh => remake-after-makefile-am.sh} (97%)
rename t/{remake11.sh => remake-deeply-nested.sh} (100%)
rename t/{remake7.sh => remake-fail.sh} (100%)
rename t/{remake10c.sh => remake-include-aclocal.sh} (96%)
rename t/{remake10a.sh => remake-include-configure.sh} (95%)
rename t/{remake10b.sh => remake-include-makefile.sh} (95%)
rename t/{remake5.sh => remake-maintainer-mode.sh} (100%)
rename t/{remake8a.sh => remake-makefile-intree.sh} (95%)
rename t/{remake8b.sh => remake-makefile-vpath.sh} (95%)
rename t/{remake12.sh => remake-mild-stress.sh} (100%)
rename t/{remake4.sh => remake-not-after-make-dist.sh} (100%)
rename t/{remake.sh => remake-subdir-grepping.sh} (90%)
rename t/{remake3a.sh => remake-subdir-no-makefile.sh} (97%)
rename t/{remake1a.sh => remake-subdir-only.sh} (95%)
rename t/{remake6.sh => remake-subdir3.sh} (100%)
rename t/{pr8365-remake-timing.sh => remake-timing-bug-pr8365.sh} (100%)
delete mode 100755 t/remake2.sh
delete mode 100755 t/remake3.sh
diff --git a/NEWS b/NEWS
index 15c9332..c6f6718 100644
--- a/NEWS
+++ b/NEWS
@@ -220,6 +220,10 @@ Bugs fixed in 1.12.5:
to regenerate the template corresponding to header files specified after
the first one in AC_CONFIG_HEADERS (automake bug#12495).
+ - When wrapping Microsoft tools, the 'compile' script falls back to
+ finding classic 'libname.a' style libraries when 'name.lib' and
+ 'name.dll.lib' aren't available.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.12.4:
@@ -333,7 +337,7 @@ New in 1.12.1:
- Use of the long-deprecated two- and three-arguments invocation forms
of the AM_INIT_AUTOMAKE macro now elicits a warning in the 'obsolete'
category. Starting from some future major Automake release (likely
- post-1.13), such usages will be no longer allowed.
+ post-1.13), such usages will no longer be allowed.
- Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) is
now deprecated (its use triggers a warning in the 'obsolete' category).
@@ -347,13 +351,12 @@ New in 1.12.1:
* Miscellaneous changes:
- The Automake test cases now require a proper POSIX-conforming shell.
- Older non-POSIX Bourne shells (like Solaris 10 /bin/sh) will be no
- longer accepted. In most cases, the user shouldn't have to specify
- such POSIX shell explicitly, since it will be looked up at configure
- time. Still, when this lookup fails, or when the user wants to
- override its conclusion, the variable 'AM_TEST_RUNNER_SHELL' can be
- used (pointing to the shell that will be used to run the Automake
- test cases).
+ Older non-POSIX Bourne shells (like Solaris 10 /bin/sh) will no longer
+ be accepted. In most cases, the user shouldn't have to specify such
+ POSIX shell explicitly, since it will be looked up at configure time.
+ Still, when this lookup fails, or when the user wants to override its
+ conclusion, the variable 'AM_TEST_RUNNER_SHELL' can be used (pointing
+ to the shell that will be used to run the Automake test cases).
Bugs fixed in 1.12.1:
@@ -724,7 +727,7 @@ Bugs fixed in 1.11.3:
- Automake now correctly recognizes the prefix/primary combination
'pkglibexec_SCRIPTS' as valid.
- - The parallel-tests harness now doesn't trip on sed implementations
+ - The parallel-tests harness no longer trips on sed implementations
with stricter limits on the length of input lines (problem seen at
least on Solaris 8).
diff --git a/gen-testsuite-part b/gen-testsuite-part
index dee4cdd..96f43cc 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -270,37 +270,55 @@ print <<EOF;
EOF
-# FIXME: the following is not really right, since cannot compose wrapping
-# of tests matching more than one condition. Still, there should be no
-# such test at the moment, so the limitation is (temporarily) acceptable.
-while (my ($k, $g) = each %test_generators)
+# A test script '$test' can possibly match more than one condition, so
+# for each tests we need to keep a list of generated wrapper tests.
+# Since what defines these wrapper scripts is the set of initializations
+# that are issued before sourcing the original, wrapped tests, these
+# initializations is what we put in our list entries.
+# The list will be saved in the hash entry '$wrapper_setups{$test}'.
+my %wrapper_setups = ();
+foreach my $test (@all_tests)
{
- my @wrapped_tests = grep {
- line_match ($g->{line_matcher}, $_)
- && (!$g->{line_rejecter} || !line_match ($g->{line_rejecter}, $_))
- } @all_tests;
- foreach my $wrapped_test (@wrapped_tests)
+ my @setups = ('');
+ foreach my $x (values %test_generators)
+ {
+ next
+ if not line_match $x->{line_matcher}, $test;
+ next
+ if $x->{line_rejecter} and line_match $x->{line_rejecter}, $test;
+ @setups = map { ($_, "$_\n$x->{shell_setup_code}") } @setups;
+ }
+ @setups = grep { $_ ne '' } @setups;
+ $wrapper_setups{$test} = address@hidden if @setups;
+ }
+# And now create all the wrapper tests.
+while (my ($wrapped_test, $setup_list) = each %wrapper_setups)
+ {
+ (my $base = $wrapped_test) =~ s/\.([^.]*)$//;
+ my $suf = $1 or die "$me: test '$wrapped_test' lacks a suffix\n";
+ my $count = 0;
+ foreach my $setup (@$setup_list)
{
- (my $base = $wrapped_test) =~ s/\.([^.]*)$//;
- my $suf = $1 or die "$me: test '$wrapped_test' lacks a suffix\n";
- my $wrapper_test = "$base-w.$suf";
+ $count++;
+ my $wbase = "$base-w" . ($count > 1 ? $count : '');
+ my $wrapper_test = "$wbase.$suf";
# Register wrapper test as "autogenerated".
push @generated_tests, $wrapper_test;
# Create wrapper test.
atomic_write $wrapper_test,
sub { write_wrapper_script $_[0], $wrapped_test,
- $g->{shell_setup_code} },
+ $setup },
0555;
# The generated test works by sourcing the original test, so that
# it has to be re-run every time that changes ...
- print "$base-w.log: $wrapped_test\n";
+ print "$wbase.log: $wrapped_test\n";
# ... but also every time the prerequisites of the wrapped test
# changes. The simpler (although suboptimal) way to do so is to
- # ensure that the wrapped tests runs before the wrappee one (in
- # case it needs to be re-run *at all*.
+ # ensure that the wrapped tests runs before the wrapper one (in
+ # case it needs to be re-run *at all*).
# FIXME: we could maybe refactor the script to find a more
# granular way to express such implicit dependencies.
- print "$base-w.log: $base.log\n";
+ print "$wbase.log: $base.log\n";
}
}
@@ -322,8 +340,11 @@ my %depmodes =
makedepend => ["cc", "makedepend"],
dashmstdout => ["gcc"],
cpp => ["gcc"],
-# This is for older (pre-3.x) GCC versions. Newer versions
-# have depmode "gcc3".
+# This was for older (pre-3.x) GCC versions (newer versions
+# have depmode "gcc3"). But other compilers use this depmode
+# as well (for example, the IMB xlc/xlC compilers, and the HP
+# C compiler, see 'lib/depcomp' for more info), so it's not
+# obsolete, and it's worth giving it some coverage.
gcc => ["gcc"],
# This is for older (pre-7) msvc versions. Newer versions
# have depmodes "msvc7" and "msvc7msys".
diff --git a/lib/compile b/lib/compile
index 7b4a9a7..718dc6d 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Written by Tom Tromey <address@hidden>.
@@ -112,6 +112,11 @@ func_cl_dashl ()
lib=$dir/$lib.lib
break
fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
done
IFS=$save_IFS
diff --git a/lib/config.guess b/lib/config.guess
index 137bedf..872b96a 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-08-14'
+timestamp='2012-09-25'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -306,7 +306,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
diff --git a/lib/config.sub b/lib/config.sub
index bdda9e4..826e4c6 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-08-18'
+timestamp='2012-10-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -156,7 +156,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -273,7 +273,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -389,7 +389,8 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -788,7 +789,7 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
mingw64)
diff --git a/lib/depcomp b/lib/depcomp
index 0544c68..e1f51f4 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed
's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then
fi
if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
@@ -142,13 +145,17 @@ gcc3)
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
diff --git a/t/compile4.sh b/t/compile4.sh
index 2e275a3..e5b5c57 100755
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -70,14 +70,6 @@ $MAKE
./compile cl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc"
-# cl expects archives to be named foo.lib, not libfoo.a so
-# make a simple copy here if needed. This is a severe case
-# of badness, but ignore that since this is not what is
-# being tested here...
-if test -f sub/libfoo.a; then
- cp sub/libfoo.a sub/foo.lib
-fi
-
# POSIX mandates that the compiler accepts a space between the -I,
# -l and -L options and their respective arguments. Traditionally,
# this should work also without a space. Try both usages.
diff --git a/t/compile6.sh b/t/compile6.sh
index ee47c17..529f22c 100755
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -47,6 +47,8 @@ for sp in '' ' '; do
mkdir lib
: > lib/bar.lib
: > lib/bar.dll.lib
+ : > lib/libbar.a
+ : > lib/libbaz.a
# Check if compile library search correctly
opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo)
@@ -58,6 +60,7 @@ for sp in '' ' '; do
: > syslib/bar.lib
: > syslib/bar.dll.lib
+ : > syslib/libbar.a
# Check if compile finds bar.dll.lib in syslib
opts=$(./compile ./cl foo.c -o foo -l${sp}bar -l${sp}foo)
@@ -67,6 +70,11 @@ for sp in '' ' '; do
opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo)
test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link
-LIBPATH:lib"
+ # Check if compile falls back to finding classic libname.a style libraries
+ # when name.lib or name.dll.lib isn't available.
+ opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}baz)
+ test x"$opts" = x"foo.c -Fefoo lib/libbaz.a -link -LIBPATH:lib"
+
mkdir lib2
: > lib2/bar.dll.lib
@@ -93,7 +101,7 @@ for sp in '' ' '; do
syslib2="$(pwd)/sys lib2"
LIB="$syslib2;$LIB"
- # Check if compile handles spaces in $LIB and that it prefers the order
+ # Check if compile handles spaces in $LIB and that it obeys the order
# in a multi-component $LIB.
opts=$(./compile ./cl foo.c -o foo -l${sp}foo)
test x"$opts" = x"foo.c -Fefoo $syslib2/foo.dll.lib"
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 72f737b..425e545 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -37,7 +37,7 @@ t/dist-pr109765.sh \
t/instdir-cond2.sh \
t/java-nobase.sh \
t/objext-pr10128.sh \
-t/pr8365-remake-timing.sh \
+t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
@@ -743,13 +743,13 @@ t/parallel-am.sh \
t/parallel-am2.sh \
t/parallel-am3.sh \
t/serial-tests.sh \
-t/parallel-tests.sh \
-t/parallel-tests3.sh \
-t/parallel-tests5.sh \
-t/parallel-tests6.sh \
-t/parallel-tests8.sh \
-t/parallel-tests9.sh \
-t/parallel-tests10.sh \
+t/parallel-tests-basics.sh \
+t/parallel-tests-concurrency.sh \
+t/parallel-tests-concurrency-2.sh \
+t/parallel-tests-empty.sh \
+t/parallel-tests-generated-and-distributed.sh \
+t/parallel-tests-recheck.sh \
+t/parallel-tests-trailing-whitespace.sh \
t/parallel-tests-recheck-depends-on-all.sh \
t/parallel-tests-recheck-pr11791.sh \
t/parallel-tests-exeext.sh \
@@ -904,33 +904,31 @@ t/recurs-user-override.sh \
t/recurs-user-phony.sh \
t/recurs-user-wrap.sh \
t/relativize.tap \
-t/remake.sh \
-t/remake1a.sh \
-t/remake2.sh \
-t/remake3.sh \
-t/remake3a.sh \
-t/remake4.sh \
-t/remake5.sh \
-t/remake6.sh \
-t/remake7.sh \
-t/remake8a.sh \
-t/remake8b.sh \
-t/remake9a.sh \
-t/remake9b.sh \
-t/remake9c.sh \
-t/remake9d.sh \
-t/remake10a.sh \
-t/remake10b.sh \
-t/remake10c.sh \
-t/remake11.sh \
-t/remake12.sh \
+t/remake-fail.sh \
+t/remake-not-after-make-dist.sh \
+t/remake-maintainer-mode.sh \
+t/remake-makefile-intree.sh \
+t/remake-makefile-vpath.sh \
+t/remake-after-configure-ac.sh \
+t/remake-after-makefile-am.sh \
+t/remake-after-acinclude-m4.sh \
+t/remake-after-aclocal-m4.sh \
+t/remake-include-configure.sh \
+t/remake-include-makefile.sh \
+t/remake-include-aclocal.sh \
+t/remake-deeply-nested.sh \
+t/remake-mild-stress.sh \
t/remake-all-1.sh \
t/remake-all-2.sh \
t/remake-recurs-user.sh \
-t/remake-subdir-from-subdir.sh \
-t/remake-subdir-gnu.sh \
t/remake-subdir.sh \
t/remake-subdir2.sh \
+t/remake-subdir3.sh \
+t/remake-subdir-only.sh \
+t/remake-subdir-grepping.sh \
+t/remake-subdir-from-subdir.sh \
+t/remake-subdir-gnu.sh \
+t/remake-subdir-no-makefile.sh \
t/remake-subdir-long-time.sh \
t/remake-gnulib-add-acsubst.sh \
t/remake-gnulib-add-header.sh \
@@ -948,7 +946,7 @@ t/remake-deleted-am.sh \
t/remake-renamed-am.sh \
t/remake-aclocal-version-mismatch.sh \
t/remake-macrodir.sh \
-t/pr8365-remake-timing.sh \
+t/remake-timing-bug-pr8365.sh \
t/req.sh \
t/reqd.sh \
t/reqd2.sh \
diff --git a/t/parallel-tests.sh b/t/parallel-tests-basics.sh
similarity index 100%
rename from t/parallel-tests.sh
rename to t/parallel-tests-basics.sh
diff --git a/t/parallel-tests5.sh b/t/parallel-tests-concurrency-2.sh
similarity index 100%
rename from t/parallel-tests5.sh
rename to t/parallel-tests-concurrency-2.sh
diff --git a/t/parallel-tests3.sh b/t/parallel-tests-concurrency.sh
similarity index 100%
rename from t/parallel-tests3.sh
rename to t/parallel-tests-concurrency.sh
diff --git a/t/parallel-tests6.sh b/t/parallel-tests-empty.sh
similarity index 94%
rename from t/parallel-tests6.sh
rename to t/parallel-tests-empty.sh
index b0fc34a..146f1fc 100755
--- a/t/parallel-tests6.sh
+++ b/t/parallel-tests-empty.sh
@@ -17,7 +17,7 @@
# Check parallel-tests features:
# - empty TESTS
# BSD make will expand '$(TESTS:=.log)' to '.log' unless overridden.
-# See 'parallel-tests10.sh' for a similar issue.
+# See 'parallel-tests-trailing-whitespace.sh' for a similar issue.
. ./defs || exit 1
cat >> configure.ac << 'END'
diff --git a/t/parallel-tests8.sh
b/t/parallel-tests-generated-and-distributed.sh
similarity index 100%
rename from t/parallel-tests8.sh
rename to t/parallel-tests-generated-and-distributed.sh
diff --git a/t/parallel-tests9.sh b/t/parallel-tests-recheck.sh
similarity index 100%
rename from t/parallel-tests9.sh
rename to t/parallel-tests-recheck.sh
diff --git a/t/parallel-tests10.sh b/t/parallel-tests-trailing-whitespace.sh
similarity index 100%
rename from t/parallel-tests10.sh
rename to t/parallel-tests-trailing-whitespace.sh
diff --git a/t/remake9c.sh b/t/remake-after-acinclude-m4.sh
similarity index 97%
rename from t/remake9c.sh
rename to t/remake-after-acinclude-m4.sh
index 402bef9..7c899dc 100755
--- a/t/remake9c.sh
+++ b/t/remake-after-acinclude-m4.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules when acinclude.m4 or its prerequisites change.
-# Keep in sync with the other sister tests 'remake9*.sh'.
+# Keep in sync with the other sister tests 'remake-after-*.sh'.
. ./defs || exit 1
diff --git a/t/remake9d.sh b/t/remake-after-aclocal-m4.sh
similarity index 97%
rename from t/remake9d.sh
rename to t/remake-after-aclocal-m4.sh
index 1cf3fdf..45d7a6a 100755
--- a/t/remake9d.sh
+++ b/t/remake-after-aclocal-m4.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules when aclocal.m4 or its prerequisites change.
-# Keep in sync with the other sister tests 'remake9*.sh'.
+# Keep in sync with the other sister tests 'remake-after-*.sh'.
. ./defs || exit 1
diff --git a/t/remake9a.sh b/t/remake-after-configure-ac.sh
similarity index 97%
rename from t/remake9a.sh
rename to t/remake-after-configure-ac.sh
index 3e239c9..ee178b1 100755
--- a/t/remake9a.sh
+++ b/t/remake-after-configure-ac.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules when configure.ac or its prerequisites change.
-# Keep in sync with the other sister tests 'remake9*.sh'.
+# Keep in sync with the other sister tests 'remake-after-*.sh'.
. ./defs || exit 1
diff --git a/t/remake9b.sh b/t/remake-after-makefile-am.sh
similarity index 97%
rename from t/remake9b.sh
rename to t/remake-after-makefile-am.sh
index aee41c4..fca90b6 100755
--- a/t/remake9b.sh
+++ b/t/remake-after-makefile-am.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules when Makefile.am or its prerequisites change.
-# Keep in sync with the other sister tests 'remake9*.sh'.
+# Keep in sync with the other sister tests 'remake-after-*.sh'.
. ./defs || exit 1
diff --git a/t/remake11.sh b/t/remake-deeply-nested.sh
similarity index 100%
rename from t/remake11.sh
rename to t/remake-deeply-nested.sh
diff --git a/t/remake7.sh b/t/remake-fail.sh
similarity index 100%
rename from t/remake7.sh
rename to t/remake-fail.sh
diff --git a/t/remake10c.sh b/t/remake-include-aclocal.sh
similarity index 96%
rename from t/remake10c.sh
rename to t/remake-include-aclocal.sh
index 7ac0ae6..da0a070 100755
--- a/t/remake10c.sh
+++ b/t/remake-include-aclocal.sh
@@ -15,8 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules for m4 files included (also recursively) by
-# aclocal.m4.
-# Keep in sync with sister tests 'remake10a.sh' and 'remake10b.sh'.
+# aclocal.m4. Keep in sync with sister tests:
+# - remake-include-configure.sh
+# - remake-include-makefile.sh
. ./defs || exit 1
diff --git a/t/remake10a.sh b/t/remake-include-configure.sh
similarity index 95%
rename from t/remake10a.sh
rename to t/remake-include-configure.sh
index e91503b..f7f8c04 100755
--- a/t/remake10a.sh
+++ b/t/remake-include-configure.sh
@@ -15,8 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules for m4 files included (also recursively) by
-# configure.ac.
-# Keep in sync with sister tests 'remake10b.sh' and 'remake10c.sh'.
+# configure.ac. Keep in sync with sister tests:
+# - remake-include-aclocal.sh
+# - remake-include-makefile.sh
. ./defs || exit 1
diff --git a/t/remake10b.sh b/t/remake-include-makefile.sh
similarity index 95%
rename from t/remake10b.sh
rename to t/remake-include-makefile.sh
index 2c6e22a..ed749cc 100755
--- a/t/remake10b.sh
+++ b/t/remake-include-makefile.sh
@@ -15,8 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test remake rules for am files included (also recursively) by
-# Makefile.am.
-# Keep in sync with sister tests 'remake10a.sh' and 'remake10c.sh'.
+# Makefile.am. Keep in sync with sister tests:
+# - remake-include-aclocal.sh
+# - remake-include-configure.sh
+
. ./defs || exit 1
diff --git a/t/remake5.sh b/t/remake-maintainer-mode.sh
similarity index 100%
rename from t/remake5.sh
rename to t/remake-maintainer-mode.sh
diff --git a/t/remake8a.sh b/t/remake-makefile-intree.sh
similarity index 95%
rename from t/remake8a.sh
rename to t/remake-makefile-intree.sh
index 5ec642d..3c4d45a 100755
--- a/t/remake8a.sh
+++ b/t/remake-makefile-intree.sh
@@ -18,8 +18,8 @@
# This testcase checks dependency of generated Makefile from Makefile.am,
# configure.ac, acinclude.m4, aclocal.m4, and extra m4 files considered
# by aclocal.
-# Keep this in sync with sister test 'remake8b.sh', which performs the
-# same checks for a VPATH build.
+# Keep this in sync with sister test 'remake-makefile-vpath.sh', which
+# performs the same checks for a VPATH build.
. ./defs || exit 1
@@ -43,7 +43,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE
-srcdir='.' # To make syncing with remake8b.sh easier.
+srcdir='.' # To make syncing with remake-makefile-vpath.sh easier.
$srcdir/configure
diff --git a/t/remake8b.sh b/t/remake-makefile-vpath.sh
similarity index 95%
rename from t/remake8b.sh
rename to t/remake-makefile-vpath.sh
index 9dca90e..737b046 100755
--- a/t/remake8b.sh
+++ b/t/remake-makefile-vpath.sh
@@ -18,8 +18,8 @@
# This testcase checks dependency of generated Makefile from Makefile.am,
# configure.ac, acinclude.m4, aclocal.m4, and extra m4 files considered
# by aclocal.
-# Keep this in sync with sister test 'remake8a.sh', which performs the
-# same checks for a in-tree build.
+# Keep this in sync with sister test 'remake-makefile-instree.sh', which
+# performs the same checks for a in-tree build.
. ./defs || exit 1
@@ -45,7 +45,7 @@ $AUTOMAKE
mkdir build
cd build
-srcdir='..' # To make syncing with remake8a.sh easier.
+srcdir='..' # To make syncing with remake-makefile-intree.sh easier.
$srcdir/configure
diff --git a/t/remake12.sh b/t/remake-mild-stress.sh
similarity index 100%
rename from t/remake12.sh
rename to t/remake-mild-stress.sh
diff --git a/t/remake4.sh b/t/remake-not-after-make-dist.sh
similarity index 100%
rename from t/remake4.sh
rename to t/remake-not-after-make-dist.sh
diff --git a/t/remake.sh b/t/remake-subdir-grepping.sh
similarity index 90%
rename from t/remake.sh
rename to t/remake-subdir-grepping.sh
index bd39792..0cce72e 100755
--- a/t/remake.sh
+++ b/t/remake-subdir-grepping.sh
@@ -16,7 +16,7 @@
# Weak "grepping" test trying to ensure that remaking rules in a subdir
# are correctly generated.
-# See also sister functional test 'remake1a.sh'.
+# See also sister functional test 'remake-subdir-only.sh'.
. ./defs || exit 1
@@ -34,5 +34,6 @@ $ACLOCAL
$AUTOMAKE
grep '^Makefile' sub/Makefile.in
+grep '\$(AUTOMAKE).* sub/Makefile' sub/Makefile.in
:
diff --git a/t/remake3a.sh b/t/remake-subdir-no-makefile.sh
similarity index 97%
rename from t/remake3a.sh
rename to t/remake-subdir-no-makefile.sh
index 0f2407a..5291ddd 100755
--- a/t/remake3a.sh
+++ b/t/remake-subdir-no-makefile.sh
@@ -16,7 +16,6 @@
# Ensure that remake rules work for files in a subdirectory even when
# there is no Makefile for that subdirectory.
-# See also sister "grepping" test 'remake3.sh'.
. ./defs || exit 1
diff --git a/t/remake1a.sh b/t/remake-subdir-only.sh
similarity index 95%
rename from t/remake1a.sh
rename to t/remake-subdir-only.sh
index cdf494a..12d1ca5 100755
--- a/t/remake1a.sh
+++ b/t/remake-subdir-only.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure remaking rules in subdir are correctly generated.
-# See also sister "grepping" test 'remake.sh'.
+# See also sister "grepping" test 'remake-subdir-grepping.sh'.
. ./defs || exit 1
diff --git a/t/remake6.sh b/t/remake-subdir3.sh
similarity index 100%
rename from t/remake6.sh
rename to t/remake-subdir3.sh
diff --git a/t/pr8365-remake-timing.sh b/t/remake-timing-bug-pr8365.sh
similarity index 100%
rename from t/pr8365-remake-timing.sh
rename to t/remake-timing-bug-pr8365.sh
diff --git a/t/remake2.sh b/t/remake2.sh
deleted file mode 100755
index ff88d78..0000000
--- a/t/remake2.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 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/>.
-
-# Weak "grepping" test trying to ensure that remaking rules in subdir
-# are correct even when there is no upper-level Makefile.
-# TODO: we should really add also functional tests for this!
-
-. ./defs || exit 1
-
-cat > configure.ac <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '\$(AUTOMAKE).*sub/Makefile' sub/Makefile.in
-
-:
diff --git a/t/remake3.sh b/t/remake3.sh
deleted file mode 100755
index 712badc..0000000
--- a/t/remake3.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-2012 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/>.
-
-# Weak "grepping" test trying to ensure that remake rules work for files
-# in a subdirectory even when there is no Makefile for that subdirectory.
-# See also sister functional test 'remake3a.sh'.
-
-. ./defs || exit 1
-
-cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/foo])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-mkdir sub
-: > sub/foo.in
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^sub/foo' Makefile.in
-
-:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-190-g26b7855,
Stefano Lattarini <=