[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-1765
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1765-gcff337e |
|
Date: |
Wed, 18 Jan 2012 13:17:54 +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=cff337e603794fac08d87e870b5a5cecb0491d40
The branch, master has been updated
via cff337e603794fac08d87e870b5a5cecb0491d40 (commit)
via b4ba4e866e1842a7a54b9affceb355b55215c35c (commit)
via a1e77caf20a62b14d549307a73131fedb9c0f696 (commit)
via fbeda3da9d12736b3dcc6d1e11e9f2f09cf4ce96 (commit)
via 2a9862a89875f9060f95547b6fd4274c86738617 (commit)
via a6e60819ba512d6bf7376c543f8c40c9389eb4d7 (commit)
from f4298e61d0d9d2a87e8a43edd4aa7133455c5d7b (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 cff337e603794fac08d87e870b5a5cecb0491d40
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 18 14:15:03 2012 +0100
build: simplify our top-level "recheck" target
* Makefile.am (recheck): Now that all the test scripts are in
the 'tests/' directory, its recipe can be greatly simplified,
as we don't need to deal with recursion in multiple subdirectories
anymore.
commit b4ba4e866e1842a7a54b9affceb355b55215c35c
Merge: f4298e6 a1e77ca
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 18 14:08:57 2012 +0100
Merge branch 'maint'
* maint:
cosmetics: move CheckListOfTests.am into tests/
tests: move all under the same hierarchy ('tests/' directory)
gitlog-to-changelog: update from upstream
changelog: don't cluster multiple entries under the same "date line"
+ Extra non-trivial edits:
* tests/Makefile.am (XFAIL_TESTS): Update with the xfailing tests
that were in 'lib/Automake/tests'. Add proper "FIXME" comment.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +-
Makefile.am | 35 ++----------
configure.ac | 1 -
lib/Automake/Makefile.am | 7 +--
lib/Automake/tests/Makefile.am | 56 --------------------
lib/gitlog-to-changelog | 24 ++++++---
CheckListOfTests.am => tests/CheckListOfTests.am | 15 ++++--
tests/Makefile.am | 18 +++++-
tests/list-of-tests.mk | 16 ++++++
{lib/Automake/tests => tests/pm}/Cond2.pl | 0
{lib/Automake/tests => tests/pm}/Cond3.pl | 0
{lib/Automake/tests => tests/pm}/Condition-t.pl | 0
{lib/Automake/tests => tests/pm}/Condition.pl | 0
{lib/Automake/tests => tests/pm}/DisjCon2.pl | 0
{lib/Automake/tests => tests/pm}/DisjCon3.pl | 0
.../tests => tests/pm}/DisjConditions-t.pl | 0
{lib/Automake/tests => tests/pm}/DisjConditions.pl | 0
{lib/Automake/tests => tests/pm}/Version.pl | 0
{lib/Automake/tests => tests/pm}/Version2.pl | 0
{lib/Automake/tests => tests/pm}/Version3.pl | 0
{lib/Automake/tests => tests/pm}/Wrap.pl | 0
21 files changed, 67 insertions(+), 109 deletions(-)
delete mode 100644 lib/Automake/tests/Makefile.am
rename CheckListOfTests.am => tests/CheckListOfTests.am (85%)
rename {lib/Automake/tests => tests/pm}/Cond2.pl (100%)
rename {lib/Automake/tests => tests/pm}/Cond3.pl (100%)
rename {lib/Automake/tests => tests/pm}/Condition-t.pl (100%)
rename {lib/Automake/tests => tests/pm}/Condition.pl (100%)
rename {lib/Automake/tests => tests/pm}/DisjCon2.pl (100%)
rename {lib/Automake/tests => tests/pm}/DisjCon3.pl (100%)
rename {lib/Automake/tests => tests/pm}/DisjConditions-t.pl (100%)
rename {lib/Automake/tests => tests/pm}/DisjConditions.pl (100%)
rename {lib/Automake/tests => tests/pm}/Version.pl (100%)
rename {lib/Automake/tests => tests/pm}/Version2.pl (100%)
rename {lib/Automake/tests => tests/pm}/Version3.pl (100%)
rename {lib/Automake/tests => tests/pm}/Wrap.pl (100%)
diff --git a/.gitignore b/.gitignore
index a1e84be..46607dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,6 @@ Makefile
/doc/amhello/install-sh
/doc/amhello/missing
/lib/Automake/Config.pm
-/lib/Automake/tests/*.log
-/lib/Automake/tests/*.trs
/tests/aclocal-1.*
/tests/automake-1.*
/tests/defs-static
@@ -58,6 +56,8 @@ Makefile
/tests/*.dir
/tests/*.log
/tests/*.trs
+/tests/pm/*.log
+/tests/pm/*.trs
cscope.files
cscope.in.out
cscope.out
diff --git a/Makefile.am b/Makefile.am
index 0b7e091..fc37ef1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,6 @@
## run aclocal and automake.
SUBDIRS = lib . contrib doc m4 tests
-TEST_SUBDIRS = lib/Automake/tests tests
-
bin_SCRIPTS = automake aclocal
CLEANFILES = $(bin_SCRIPTS)
@@ -107,21 +105,10 @@ INSTALL: lib/INSTALL
installcheck-local:
am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
-## recheck: convenience proxy target for the test suites.
-.PHONY: recheck
+# Convenience proxy target for the test suites.
recheck:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- for subdir in $(TEST_SUBDIRS); do \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) \
- || eval $$failcom; \
- done; \
- test -z "$$fail"
+ $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
+.PHONY: recheck
################################################################
##
@@ -130,7 +117,8 @@ recheck:
##
gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_options = --since='2011-12-28 00:00:00'
+gitlog_to_changelog_options = --since='2011-12-28 00:00:00' \
+ --no-cluster --format '%s%n%n%b'
# Automatic generation of the ChangeLog from git history.
#
@@ -277,18 +265,7 @@ maintainer-check: $(syntax_check_rules)
## list of all test scripts in the Automake testsuite.
.PHONY: maintainer-check-list-of-tests
maintainer-check-list-of-tests:
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- for subdir in $(TEST_SUBDIRS); do \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \
- done; \
- test -z "$$fail"
-
+ $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
maintainer-check: maintainer-check-list-of-tests
## Look for test whose names can cause spurious failures when used as
diff --git a/configure.ac b/configure.ac
index af3423f..ddd6b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,6 @@ AC_CONFIG_FILES([
contrib/Makefile
doc/Makefile
lib/Automake/Makefile
- lib/Automake/tests/Makefile
lib/Makefile
lib/am/Makefile
m4/Makefile
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index cfc7272..9805024 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to create Makefile.in
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010, 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
@@ -16,9 +16,6 @@
# 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 clean check' should build Config.pm first.
-SUBDIRS = . tests
-
perllibdir = $(pkgvdatadir)/Automake
dist_perllib_DATA = \
ChannelDefs.pm \
diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am
deleted file mode 100644
index 42b1e54..0000000
--- a/lib/Automake/tests/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2002, 2003, 2008, 2009, 2010, 2011, 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/>.
-
-PL_LOG_COMPILER = $(PERL)
-AM_TESTS_ENVIRONMENT = \
- case $$am_running_installcheck in \
- yes) am_pl_I_flags='-I $(pkgvdatadir)';; \
- *) am_pl_I_flags='-I ../.. -I $(top_srcdir)/lib';; \
- esac;
-AM_PL_LOG_FLAGS = -Mstrict -w $$am_pl_I_flags
-TEST_EXTENSIONS = .pl
-
-TESTS = \
-Condition.pl \
-Condition-t.pl \
-Cond2.pl \
-Cond3.pl \
-DisjConditions.pl \
-DisjConditions-t.pl \
-DisjCon2.pl \
-DisjCon3.pl \
-Version.pl \
-Version2.pl \
-Version3.pl \
-Wrap.pl
-
-XFAIL_TESTS = \
-Cond2.pl \
-Cond3.pl \
-DisjCon2.pl \
-DisjCon3.pl \
-Version2.pl \
-Version3.pl
-
-EXTRA_DIST = $(TESTS)
-
-include $(top_srcdir)/CheckListOfTests.am
-
-# Run the testsuite with the installed aclocal and automake.
-installcheck-local:
- am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 0efedb0..38c6f3a 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
if 0;
# Convert git log output to ChangeLog format.
-my $VERSION = '2012-01-06 07:14'; # UTC
+my $VERSION = '2012-01-18 07:50'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -64,6 +64,10 @@ OPTIONS:
makes a change to SHA1's commit log text or metadata.
--append-dot append a dot to the first line of each commit message if
there is no other punctuation or blank at the end.
+ --no-cluster never cluster commit messages under the same date/author
+ header; the default is to cluster adjacent commit messages
+ if their headers are the same and neither commit message
+ contains multiple paragraphs.
--since=DATE convert only the logs since DATE;
the default is to convert all log entries.
--format=FMT set format string for commit subject and body;
@@ -190,6 +194,7 @@ sub parse_amend_file($)
my $format_string = '%s%n%b%n';
my $amend_file;
my $append_dot = 0;
+ my $cluster = 1;
GetOptions
(
help => sub { usage 0 },
@@ -198,6 +203,7 @@ sub parse_amend_file($)
'format=s' => \$format_string,
'amend=s' => \$amend_file,
'append-dot' => \$append_dot,
+ 'cluster!' => \$cluster,
) or usage 1;
@@ -302,13 +308,15 @@ sub parse_amend_file($)
. substr ($_, 5) . "\n";
}
- # If this header would be different from the previous date/name/email/
- # coauthors header, or if this or the previous entry consists of two
- # or more paragraphs, then print the header.
- if ($date_line ne $prev_date_line
- or "@coauthors" ne "@prev_coauthors"
- or $multi_paragraph
- or $prev_multi_paragraph)
+ # If clustering of commit messages has been disabled, if this header
+ # would be different from the previous date/name/email/coauthors header,
+ # or if this or the previous entry consists of two or more paragraphs,
+ # then print the header.
+ if ( ! $cluster
+ || $date_line ne $prev_date_line
+ || "@coauthors" ne "@prev_coauthors"
+ || $multi_paragraph
+ || $prev_multi_paragraph)
{
$prev_date_line eq ''
or print "\n";
diff --git a/CheckListOfTests.am b/tests/CheckListOfTests.am
similarity index 85%
rename from CheckListOfTests.am
rename to tests/CheckListOfTests.am
index 0a48447..c71c7fc 100644
--- a/CheckListOfTests.am
+++ b/tests/CheckListOfTests.am
@@ -37,13 +37,18 @@ maintainer-check-list-of-tests:
for t in $$lst; do \
echo "$$t"; \
done | sort >$(am__tmk); \
+## List of subdirs where to look for tests.
+ dirs='$(test_subdirs)'; \
+ test -n "$$dirs" || dirs=.; \
## List of tests on filesystem. Be careful to cater for VPATH builds too.
for ext in $(TEST_EXTENSIONS); do \
- ls *$$ext 2>/dev/null; \
- if test $(srcdir) != $(builddir); then \
- (cd $(srcdir) && ls *$$ext 2>/dev/null); \
- fi; \
- done | sort | uniq >$(am__tfs); \
+ for dir in $$dirs; do \
+ ls $$dir/*$$ext 2>/dev/null; \
+ if test $(srcdir) != $(builddir); then \
+ (cd $(srcdir) && ls $$dir/*$$ext 2>/dev/null); \
+ fi; \
+ done; \
+ done | sed 's,^\./,,' | sort | uniq >$(am__tfs); \
## Compare the two lists, complain if they differ.
if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
result=0; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d5c254..5696b44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,9 +20,11 @@
# Run the tests with the shell detected at configure time.
LOG_COMPILER = $(SHELL)
-TEST_EXTENSIONS = .test .tap
+TEST_EXTENSIONS = .pl .test .tap
TEST_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_COMPILER = $(LOG_COMPILER)
+PL_LOG_COMPILER = $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
@@ -52,7 +54,16 @@ pr8365-remake-timing.test \
lex-subobj-nodep.test \
remake-am-pr10111.test \
remake-m4-pr10111.test \
-txinfo5.test
+txinfo5.test \
+## FIXME: this "expected failures" are in truth an hack used to
+## FIXME: to verify that some incorrect usages of our perl: libraries
+## FIXME: raise an error. We should find a cleaner way to check that.
+pm/Cond2.pl \
+pm/Cond3.pl \
+pm/DisjCon2.pl \
+pm/DisjCon3.pl \
+pm/Version2.pl \
+pm/Version3.pl
# Some testsuite-influential variables should be overridable from the
# test scripts, but not from the environment.
@@ -174,7 +185,8 @@ check-local: check-no-repeated-test-name
.PHONY: check-no-repeated-test-name
## Checking the list of tests.
-include $(top_srcdir)/CheckListOfTests.am
+test_subdirs = . pm
+include $(srcdir)/CheckListOfTests.am
# Run the testsuite with the installed aclocal and automake.
installcheck-local:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index b6b74d9..589f90e 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -18,12 +18,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/>.
+perl_TESTS = \
+pm/Cond2.pl \
+pm/Cond3.pl \
+pm/Condition.pl \
+pm/Condition-t.pl \
+pm/DisjCon2.pl \
+pm/DisjCon3.pl \
+pm/DisjConditions.pl \
+pm/DisjConditions-t.pl \
+pm/Version.pl \
+pm/Version2.pl \
+pm/Version3.pl \
+pm/Wrap.pl
+
# The order here is mostly alphabetical, with the deliberate exception
# that tests having a high runtime (especially TAP tests that run various
# checks sequentially) are listed early; this improves performance on
# concurrent testsuite runs.
handwritten_TESTS = \
get-sysconf.test \
+$(perl_TESTS) \
depmod.tap \
instspc.tap \
aclocal.test \
@@ -1134,6 +1149,7 @@ vala3.test \
vala4.test \
vala5.test \
vala-vpath.test \
+vala-mix.test \
vars.test \
vars3.test \
vartar.test \
diff --git a/lib/Automake/tests/Cond2.pl b/tests/pm/Cond2.pl
similarity index 100%
rename from lib/Automake/tests/Cond2.pl
rename to tests/pm/Cond2.pl
diff --git a/lib/Automake/tests/Cond3.pl b/tests/pm/Cond3.pl
similarity index 100%
rename from lib/Automake/tests/Cond3.pl
rename to tests/pm/Cond3.pl
diff --git a/lib/Automake/tests/Condition-t.pl b/tests/pm/Condition-t.pl
similarity index 100%
rename from lib/Automake/tests/Condition-t.pl
rename to tests/pm/Condition-t.pl
diff --git a/lib/Automake/tests/Condition.pl b/tests/pm/Condition.pl
similarity index 100%
rename from lib/Automake/tests/Condition.pl
rename to tests/pm/Condition.pl
diff --git a/lib/Automake/tests/DisjCon2.pl b/tests/pm/DisjCon2.pl
similarity index 100%
rename from lib/Automake/tests/DisjCon2.pl
rename to tests/pm/DisjCon2.pl
diff --git a/lib/Automake/tests/DisjCon3.pl b/tests/pm/DisjCon3.pl
similarity index 100%
rename from lib/Automake/tests/DisjCon3.pl
rename to tests/pm/DisjCon3.pl
diff --git a/lib/Automake/tests/DisjConditions-t.pl
b/tests/pm/DisjConditions-t.pl
similarity index 100%
rename from lib/Automake/tests/DisjConditions-t.pl
rename to tests/pm/DisjConditions-t.pl
diff --git a/lib/Automake/tests/DisjConditions.pl b/tests/pm/DisjConditions.pl
similarity index 100%
rename from lib/Automake/tests/DisjConditions.pl
rename to tests/pm/DisjConditions.pl
diff --git a/lib/Automake/tests/Version.pl b/tests/pm/Version.pl
similarity index 100%
rename from lib/Automake/tests/Version.pl
rename to tests/pm/Version.pl
diff --git a/lib/Automake/tests/Version2.pl b/tests/pm/Version2.pl
similarity index 100%
rename from lib/Automake/tests/Version2.pl
rename to tests/pm/Version2.pl
diff --git a/lib/Automake/tests/Version3.pl b/tests/pm/Version3.pl
similarity index 100%
rename from lib/Automake/tests/Version3.pl
rename to tests/pm/Version3.pl
diff --git a/lib/Automake/tests/Wrap.pl b/tests/pm/Wrap.pl
similarity index 100%
rename from lib/Automake/tests/Wrap.pl
rename to tests/pm/Wrap.pl
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1765-gcff337e,
Stefano Lattarini <=