[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI] {testsuite-work} tests: few minor fixlets, improvements and tweaki
From: |
Stefano Lattarini |
Subject: |
[FYI] {testsuite-work} tests: few minor fixlets, improvements and tweakings |
Date: |
Fri, 23 Dec 2011 20:40:58 +0100 |
* tests/defs-static.in ($top_testbuilddir): New, for consistency
and completeness.
* tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
as well.
* tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
over TESTS_ENVIRONMENT, now that the former has become available.
* tests/java-compile-run-flat.test: Correct a botched "FIXME"
comment.
* tests/tap-realtime.test: Remove extra whitespace in comments.
* tests/missing-tar.test: Use `get_shell_script' to bring in the
`missing' script, to increase coverage. Remove redundant call to
`set -e'. Fix a typo in comments.
* tests/get-sysconf.test: Remove redundant definitions of
`$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
---
ChangeLog | 18 ++++++++++++++++++
tests/Makefile.am | 1 +
tests/defs-static.in | 1 +
tests/get-sysconf.test | 5 -----
tests/java-compile-run-flat.test | 4 +++-
tests/java-compile-run-nested.test | 3 +--
tests/missing-tar.test | 10 ++--------
tests/tap-realtime.test | 2 +-
8 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 538e991..3fd3bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2011-12-23 Stefano Lattarini <address@hidden>
+ tests: few minor fixlets, improvements and tweakings
+ * tests/defs-static.in ($top_testbuilddir): New, for consistency
+ and completeness.
+ * tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
+ as well.
+ * tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
+ over TESTS_ENVIRONMENT, now that the former has become available.
+ * tests/java-compile-run-flat.test: Correct a botched "FIXME"
+ comment.
+ * tests/tap-realtime.test: Remove extra whitespace in comments.
+ * tests/missing-tar.test: Use `get_shell_script' to bring in the
+ `missing' script, to increase coverage. Remove redundant call to
+ `set -e'. Fix a typo in comments.
+ * tests/get-sysconf.test: Remove redundant definitions of
+ `$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
+
+2011-12-23 Stefano Lattarini <address@hidden>
+
tests: remove redundant uses of `set -e'
* tests/deleted-am.test: Do not set the `errexit' shell flag, as
it is already set by `tests/defs'.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25de9a4..32824ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -119,6 +119,7 @@ do_subst = sed \
-e 's|@address@hidden|$(abs_srcdir)|g' \
-e 's|@address@hidden|$(abs_top_srcdir)|g' \
-e 's|@address@hidden|$(abs_builddir)|g' \
+ -e 's|@address@hidden|$(abs_top_builddir)|g' \
-e 's|@address@hidden|$(prefix)|g' \
-e 's|@address@hidden|$(amdir)|g' \
-e 's|@address@hidden|$(bindir)|g' \
diff --git a/tests/defs-static.in b/tests/defs-static.in
index af8f501..2bae9c1 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -99,6 +99,7 @@ fi
testsrcdir='@abs_srcdir@'
top_testsrcdir='@abs_top_srcdir@'
testbuilddir='@abs_builddir@'
+top_testbuilddir='@abs_top_builddir@'
testprefix='@prefix@'
# Support for the "installcheck" target.
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 6e1163e..fe78d70 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -22,11 +22,6 @@
. ./defs || Exit 1
-# FIXME: remove these once we are merged into master.
-top_testsrcdir=$testsrcdir/..
-testbuilddir=`(cd .. && pwd)`
-top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
-
st=0
sed 20q "$top_testsrcdir/ChangeLog" || st=1
$PERL -V || st=1
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index 3e2bcfd..4a00aef 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -149,7 +149,9 @@ END
## TESTS ##
cat >> Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
+## We must use `TESTS_ENVIRONMENT', not `AM_TESTS_ENVIRONMENT',
+## because the latter is not hnoured by the old serial test
+## harness.
TESTS_ENVIRONMENT = \
if test x"$$jprog_doing_installcheck" != x"yes"; then \
jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
diff --git a/tests/java-compile-run-nested.test
b/tests/java-compile-run-nested.test
index dbdf4a1..30bd6a0 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -162,8 +162,7 @@ END
mkdir tests
cat > tests/Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
if test x"$$jprog_doing_installcheck" != x"yes"; then \
jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
export jprog_classpath; \
diff --git a/tests/missing-tar.test b/tests/missing-tar.test
index 889ae20..72c7f07 100755
--- a/tests/missing-tar.test
+++ b/tests/missing-tar.test
@@ -14,17 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test how the `missing' script wraps the`tar' program .
-# FIXME: we should also try to run the `missing' script with the
-# $CONFIG_SHELL ...
+# Test how the `missing' script wraps the`tar' program.
. ./defs || Exit 1
-set -e
-
-# FIXME: make this working with "installcheck" too ...
-cp "$testsrcdir"/../lib/missing . \
- || fatal_ "failed to fetch auxiliary script \`missing'"
+get_shell_script "missing"
old_PATH=$PATH; export old_PATH
new_PATH=`pwd`/bin$PATH_SEPARATOR$PATH
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 1b3d239..2cdcda9 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -18,7 +18,7 @@
# - testsuite progress on console should happen mostly "in real time";
# i.e., it's not acceptable for the driver to wait the end of the
# script to start displaying results from it.
-# FIXME: this test uses expect(1) to ensure line buffering from make and
+# FIXME: this test uses expect(1) to ensure line buffering from make and
# children, and is pretty hacky and complex; is there a better way to
# accomplish the checks done here?
--
1.7.7.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [FYI] {testsuite-work} tests: few minor fixlets, improvements and tweakings,
Stefano Lattarini <=