Here I present four simple patches that were originally part of my
patch series on the refactoring of 'tests/defs'. But they are mostly
indipendent from that series, which (by the way) is already growing
way too long. So I though it convenient and appropriate to seperated
them, and post them before the rest of the series.
Since these patches are very simple, and independent one from the
other, I simply attach all them four to this mail. Hope that's OK.
Regards,
Stefano
From 2adf097a1e22660ddd54721665eb11e009f14c51 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 9 Jun 2010 02:41:24 +0200
Subject: [PATCH 1/4] Tests defs: truly get rid of `$am_defs_included' (unused variable)
* tests/defs.in ($am_defs_included): Remove, its now unused. It
should have been removed in a previous changeset, but the removal
was done only partially (oversight).
---
ChangeLog | 7 +++++++
tests/defs.in | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c4e69a5..f4e5cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ Tests defs: truly get rid of `$am_defs_included' (unused variable)
+ * tests/defs.in ($am_defs_included): Remove, its now unused. It
+ should have been removed in a previous changeset, but the removal
+ was done only partially (oversight).
+
2010-06-12 Ralf Wildenhues <ralf.wildenh...@gmx.de>
Remove a couple of unneeded conditionals from tests.
diff --git a/tests/defs.in b/tests/defs.in
index e00aed5..9bb6333 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -431,9 +431,6 @@ AUTOMAKE_fails ()
AUTOMAKE_run 1 ${1+"$@"}
}
-# Register that this file has alredy been sourced.
-am_defs_included=yes
-
# Turn on shell traces.
set -x
--
1.6.5
From 0f11d07e31e36c44c77c9eabcb7155d4223e253e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 9 Jun 2010 02:57:24 +0200
Subject: [PATCH 2/4] Parallel tests generation: improve comments (tiny change).
* tests/Makefile.am ($(parallel_tests)): Added useful comment to
generated tests.
---
ChangeLog | 4 ++++
tests/Makefile.am | 2 ++
tests/Makefile.in | 2 ++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4e5cf5..3bfea36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-06-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Parallel tests generation: improve comments (tiny change).
+ * tests/Makefile.am ($(parallel_tests)): Added useful comment to
+ generated tests.
+
Tests defs: truly get rid of `$am_defs_included' (unused variable)
* tests/defs.in ($am_defs_included): Remove, its now unused. It
should have been removed in a previous changeset, but the removal
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7875fc5..106f4a7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,8 @@ $(parallel_tests): Makefile.am
echo; \
echo "# Run the test with Automake's parallel-tests driver enabled."; \
echo 'parallel_tests=yes'; \
+ echo "# In the spirit of VPATH, we prefer a test in the build tree"; \
+ echo "# over one in the source tree."; \
echo "if test -f \"./$$input\"; then"; \
echo " . \"./$$input\""; \
echo 'else'; \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 07f27ed..35245dd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1402,6 +1402,8 @@ $(parallel_tests): Makefile.am
echo; \
echo "# Run the test with Automake's parallel-tests driver enabled."; \
echo 'parallel_tests=yes'; \
+ echo "# In the spirit of VPATH, we prefer a test in the build tree"; \
+ echo "# over one in the source tree."; \
echo "if test -f \"./$$input\"; then"; \
echo " . \"./$$input\""; \
echo 'else'; \
--
1.6.5
From 97df10afa325cbd4524d843f644ae06ae103acc5 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 9 Jun 2010 02:59:22 +0200
Subject: [PATCH 3/4] Normalize whitespaces in 'tests/Makefile.am'.
* tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
definition of this variable.
---
ChangeLog | 4 ++++
tests/Makefile.am | 22 +++++++++++-----------
tests/Makefile.in | 20 ++++++++++----------
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3bfea36..5f612e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-06-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Normalize whitespaces in 'tests/Makefile.am'.
+ * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
+ definition of this variable.
+
Parallel tests generation: improve comments (tiny change).
* tests/Makefile.am ($(parallel_tests)): Added useful comment to
generated tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 106f4a7..2771a66 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,7 +53,7 @@ $(parallel_tests): Makefile.am
MAINTAINERCLEANFILES = $(parallel_tests)
-TESTS = \
+TESTS = \
aclibobj.test \
aclocal.test \
aclocal3.test \
@@ -341,7 +341,7 @@ flibs.test \
fn99.test \
fn99subdir.test \
fnoc.test \
-fo.test \
+fo.test \
forcemiss.test \
forcemiss2.test \
fort1.test \
@@ -447,12 +447,12 @@ libtoo10.test \
libtoo11.test \
license.test \
license2.test \
-link_c_cxx.test \
+link_c_cxx.test \
link_dist.test \
link_f90_only.test \
link_fc.test \
link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
link_f_only.test \
link_override.test \
lisp2.test \
@@ -651,13 +651,13 @@ srcsub.test \
srcsub2.test \
space.test \
specflg.test \
-specflg2.test \
-specflg3.test \
-specflg6.test \
-specflg7.test \
-specflg8.test \
-specflg9.test \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
spell.test \
spell2.test \
spell3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 35245dd..db53cfb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -552,7 +552,7 @@ flibs.test \
fn99.test \
fn99subdir.test \
fnoc.test \
-fo.test \
+fo.test \
forcemiss.test \
forcemiss2.test \
fort1.test \
@@ -658,12 +658,12 @@ libtoo10.test \
libtoo11.test \
license.test \
license2.test \
-link_c_cxx.test \
+link_c_cxx.test \
link_dist.test \
link_f90_only.test \
link_fc.test \
link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
link_f_only.test \
link_override.test \
lisp2.test \
@@ -862,13 +862,13 @@ srcsub.test \
srcsub2.test \
space.test \
specflg.test \
-specflg2.test \
-specflg3.test \
-specflg6.test \
-specflg7.test \
-specflg8.test \
-specflg9.test \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
spell.test \
spell2.test \
spell3.test \
--
1.6.5
From 5acfc420598f216af1d7239fe50599820fd3603d Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 2 Jun 2010 18:40:28 +0200
Subject: [PATCH 4/4] Minor simplification in obsolete.test.
* tests/obsolte.test ($required): Directly require autoupdate,
instead of relying on a useless indirection.
---
ChangeLog | 4 ++++
tests/obsolete.test | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5f612e3..3254093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-06-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Minor simplification in obsolete.test.
+ * tests/obsolte.test ($required): Directly require autoupdate,
+ instead of relying on a useless indirection.
+
Normalize whitespaces in 'tests/Makefile.am'.
* tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
definition of this variable.
diff --git a/tests/obsolete.test b/tests/obsolete.test
index e6601c9..8c6a39c 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2007, 2008, 2010 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,8 +17,7 @@
# Test to make sure obsolete macros can be autoupdated.
-set x ${AUTOUPDATE-autoupdate}
-required=$2
+required=${AUTOUPDATE-autoupdate}
. ./defs || Exit 1
cat > configure.in << 'END'
--
1.6.5
