Re: [PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
On Thursday 11 November 2010, Ralf Wildenhues wrote: > * Stefano Lattarini wrote on Thu, Nov 11, 2010 at 12:16:27AM CET: > > On Wednesday 10 November 2010, Ralf Wildenhues wrote: > > > * Stefano Lattarini wrote on Sun, Nov 07, 2010 at 04:29:27PM CET: > > > > Tests defs: move static definitions in a new file `minidefs'. > [...] > > > > * tests/defs: ... this new file ... > > > > * tests/minidefs.in: ... and this new file. > > > > > > You need to mention the remaining changes here; e.g., that defs sources > > > the other file now. > > Is this OK? > > > > * tests/defs.in: Removed, its contents split among ... > > * tests/defs-static.in: ... this new file ... > > * tests/defs: ... and this new file, including the former. > > Sure, if that really is all that was changed. Basically yes; there were a few other *minor* changes related to the split, but I assume we don't want to be overly verbose by listing them in details (and in fact, they are implicitly described by the sentence "The new file is designed to be idempotent w.r.t. mutiple inclusions" in the ChangeLog entry). Regards, Stefano
Re: [PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
* Stefano Lattarini wrote on Thu, Nov 11, 2010 at 12:16:27AM CET: > On Wednesday 10 November 2010, Ralf Wildenhues wrote: > > * Stefano Lattarini wrote on Sun, Nov 07, 2010 at 04:29:27PM CET: > > > Tests defs: move static definitions in a new file `minidefs'. [...] > > > * tests/defs: ... this new file ... > > > * tests/minidefs.in: ... and this new file. > > > > You need to mention the remaining changes here; e.g., that defs sources > > the other file now. > Is this OK? > > * tests/defs.in: Removed, its contents split among ... > * tests/defs-static.in: ... this new file ... > * tests/defs: ... and this new file, including the former. Sure, if that really is all that was changed. Thanks, Ralf
Re: [PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
On Wednesday 10 November 2010, Ralf Wildenhues wrote: > * Stefano Lattarini wrote on Sun, Nov 07, 2010 at 04:29:27PM CET: > > Tests defs: move static definitions in a new file `minidefs'. > > minidefs is not a good name, True, but I couldn't think of a better one right away. Luckily, you could ;-) > as it is bound to not stay "mini". > How about defs-static or defs-init? defs-static is good IMO. I've settled for it. > (And yes, I'm shying away from renaming defs, that's just too big and churny > a change for such a slight misnomer.) Yes, it would require modifying *all* the test scripts :-/ And I dare not to think about other possible merge problems ... > > The new file is designed to be idempotent w.r.t. mutiple inclusions, > > s/designed/meant/, no? OK. > I don't see a design document. ;-> > > > and this will help us to cope better with e.g. generated tests and > > tests with complex setups, scaffoldings or indirections. > > What is scaffoldings? I think the first line of the summary text was > completely sufficient. OK. Removed those lines. > > * tests/defs.in: Removed, it's contents split among ... > > its *blush* Fixed. > > * tests/defs: ... this new file ... > > * tests/minidefs.in: ... and this new file. > > You need to mention the remaining changes here; e.g., that defs sources > the other file now. Is this OK? * tests/defs.in: Removed, its contents split among ... * tests/defs-static.in: ... this new file ... * tests/defs: ... and this new file, including the former. > > * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add > > `tests/minidefs'. > > * configure.ac (AC_CONFIG_LINKS): Add `tests/defs'. > > * tests/Makefile.am ($(parallel_tests)): Update. > > ($(instspc_tests)): Likewise. > > * tests/.gitignore: Update. > > OK with those changes. > > Thanks, > Ralf > Thanks, Stefano
Re: [PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
* Stefano Lattarini wrote on Sun, Nov 07, 2010 at 04:29:27PM CET: > Tests defs: move static definitions in a new file `minidefs'. minidefs is not a good name, as it is bound to not stay "mini". How about defs-static or defs-init? (And yes, I'm shying away from renaming defs, that's just too big and churny a change for such a slight misnomer.) > The new file is designed to be idempotent w.r.t. mutiple inclusions, s/designed/meant/, no? I don't see a design document. ;-> > and this will help us to cope better with e.g. generated tests and > tests with complex setups, scaffoldings or indirections. What is scaffoldings? I think the first line of the summary text was completely sufficient. > * tests/defs.in: Removed, it's contents split among ... its > * tests/defs: ... this new file ... > * tests/minidefs.in: ... and this new file. You need to mention the remaining changes here; e.g., that defs sources the other file now. > * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add > `tests/minidefs'. > * configure.ac (AC_CONFIG_LINKS): Add `tests/defs'. > * tests/Makefile.am ($(parallel_tests)): Update. > ($(instspc_tests)): Likewise. > * tests/.gitignore: Update. OK with those changes. Thanks, Ralf
[PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
This is proably the most important patch of the series, and
surely the most complex one. A review on this is definitely
advisable.
-*-*-*-
Tests defs: move static definitions in a new file `minidefs'.
The new file is designed to be idempotent w.r.t. mutiple inclusions,
and this will help us to cope better with e.g. generated tests and
tests with complex setups, scaffoldings or indirections.
* tests/defs.in: Removed, it's contents split among ...
* tests/defs: ... this new file ...
* tests/minidefs.in: ... and this new file.
* configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add
`tests/minidefs'.
* configure.ac (AC_CONFIG_LINKS): Add `tests/defs'.
* tests/Makefile.am ($(parallel_tests)): Update.
($(instspc_tests)): Likewise.
* tests/.gitignore: Update.
---
ChangeLog | 14 ++
configure | 45 -
configure.ac|3 +-
tests/.gitignore|2 +-
tests/Makefile.am |6 +--
tests/Makefile.in | 18
tests/{defs.in => defs} | 120 --
tests/minidefs.in | 99 ++
8 files changed, 190 insertions(+), 117 deletions(-)
rename tests/{defs.in => defs} (76%)
create mode 100644 tests/minidefs.in
From 284e1d3273c27bf74051ad1c5ccf2fe9bbec6ee3 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 5 Nov 2010 21:29:17 +0100
Subject: [PATCH 7/7] Tests defs: move static definitions in a new file `minidefs'.
The new file is designed to be idempotent w.r.t. mutiple inclusions,
and this will help us to cope better with e.g. generated tests and
tests with complex setups, scaffoldings or indirections.
* tests/defs.in: Removed, it's contents split among ...
* tests/defs: ... this new file ...
* tests/minidefs.in: ... and this new file.
* configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add
`tests/minidefs'.
* configure.ac (AC_CONFIG_LINKS): Add `tests/defs'.
* tests/Makefile.am ($(parallel_tests)): Update.
($(instspc_tests)): Likewise.
* tests/.gitignore: Update.
---
ChangeLog | 14 ++
configure | 45 -
configure.ac|3 +-
tests/.gitignore|2 +-
tests/Makefile.am |6 +--
tests/Makefile.in | 18
tests/{defs.in => defs} | 120 --
tests/minidefs.in | 99 ++
8 files changed, 190 insertions(+), 117 deletions(-)
rename tests/{defs.in => defs} (76%)
create mode 100644 tests/minidefs.in
diff --git a/ChangeLog b/ChangeLog
index 34e6918..3616c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2010-11-06 Stefano Lattarini
+ Tests defs: move static definitions in a new file `minidefs'.
+ The new file is designed to be idempotent w.r.t. mutiple inclusions,
+ and this will help us to cope better with e.g. generated tests and
+ tests with complex setups, scaffoldings or indirections.
+ * tests/defs.in: Removed, it's contents split among ...
+ * tests/defs: ... this new file ...
+ * tests/minidefs.in: ... and this new file.
+ * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add
+ `tests/minidefs'.
+ * configure.ac (AC_CONFIG_LINKS): Add `tests/defs'.
+ * tests/Makefile.am ($(parallel_tests)): Update.
+ ($(instspc_tests)): Likewise.
+ * tests/.gitignore: Update.
+
Tests defs: new AC_SUBST'ed variable $top_testsbuilddir.
* tests/defs.in ($top_testsbuilddir): New variable, initialized
with the value AC_SUBST'ed from @abs_top_build...@. Mostly for
diff --git a/configure b/configure
index 169d82d..929b8c9 100755
--- a/configure
+++ b/configure
@@ -2783,7 +2783,9 @@ $as_echo "$as_me: WARNING: \`cd tests && ${MAKE-make} clean-local-check'" >&2;}
sh_errexit_works=$am_cv_sh_errexit_works
-ac_config_files="$ac_config_files Makefile doc/Makefile lib/Automake/Makefile lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile tests/Makefile tests/defs"
+ac_config_files="$ac_config_files Makefile doc/Makefile lib/Automake/Makefile lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile tests/Makefile tests/minidefs"
+
+ac_config_links="$ac_config_links tests/defs:tests/defs"
ac_config_files="$ac_config_files tests/aclocal-${APIVERSION}:tests/aclocal.in"
@@ -3375,6 +3377,7 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
+config_links="$ac_config_links"
_ACEOF
@@ -3399,6 +3402,9 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
+Configuration links:
+$config_links
+
Report bugs to .
GNU Automake home page: <http://www.gnu.org/software/automake/>.
General help using GNU software: <http
