This patch introduces what amounts essentially to a just cosmetic change. -*-*-
Testsuite: avoid redundant use of the `env' utility. * tests/check10.test: Use `FOO=bar command' rather than `env FOO=bar command' to run commands with modified and/or extended environments. * tests/parallel-tests2.test: Likewise. * tests/subdir10.test: Likewise. * tests/instmany-mans.test: Tell why an apparently redundant call to the `env' utility is indeed required. * tests/instmany-python.test: Likewise. * tests/instmany.test: Likewise.
From 1ff855bbcc7b4e9bde2acdfce9e6cbf68e037e80 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <[email protected]> Date: Sun, 31 Jan 2010 01:23:42 +0100 Subject: [PATCH 8/8] Testsuite: avoid redundant use of the `env' utility. * tests/check10.test: Use `FOO=bar command' rather than `env FOO=bar command' to run commands with modified and/or extended environments. * tests/parallel-tests2.test: Likewise. * tests/subdir10.test: Likewise. * tests/instmany-mans.test: Tell why an apparently redundant call to the `env' utility is indeed required. * tests/instmany-python.test: Likewise. * tests/instmany.test: Likewise. --- ChangeLog | 13 +++++++++++++ tests/check10.test | 22 +++++++++++----------- tests/instmany-mans.test | 1 + tests/instmany-python.test | 1 + tests/instmany.test | 1 + tests/parallel-tests2.test | 4 ++-- tests/subdir10.test | 2 +- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a98b1a..88f5aeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2010-01-31 Stefano Lattarini <[email protected]> + Testsuite: avoid redundant use of the `env' utility. + * tests/check10.test: Use `FOO=bar command' rather than + `env FOO=bar command' to run commands with modified and/or + extended environments. + * tests/parallel-tests2.test: Likewise. + * tests/subdir10.test: Likewise. + * tests/instmany-mans.test: Tell why an apparently redundant + call to the `env' utility is indeed required. + * tests/instmany-python.test: Likewise. + * tests/instmany.test: Likewise. + +2010-01-31 Stefano Lattarini <[email protected]> + Testsuite: improve function `run_command': now it can set additional environment variables for the command it runs. * tests/defs.in (run_command): Now this function can set diff --git a/tests/check10.test b/tests/check10.test index 76af452..1013460 100755 --- a/tests/check10.test +++ b/tests/check10.test @@ -60,17 +60,17 @@ unset TESTS || : ( # Do not check for failure in this subshell set +e - env TESTS=pass $MAKE -e check - env TESTS=fail $MAKE -e check - env TESTS=skip $MAKE -e check - env TESTS=xfail $MAKE -e check - env TESTS=xpass $MAKE -e check - env TESTS="pass pass2" $MAKE -e check - env TESTS="fail fail2" $MAKE -e check - env TESTS="skip skip2" $MAKE -e check - env TESTS="xfail xfail2" $MAKE -e check - env TESTS="xpass xpass2" $MAKE -e check - env TESTS='pass skip xfail' $MAKE -e check + TESTS=pass $MAKE -e check + TESTS=fail $MAKE -e check + TESTS=skip $MAKE -e check + TESTS=xfail $MAKE -e check + TESTS=xpass $MAKE -e check + TESTS="pass pass2" $MAKE -e check + TESTS="fail fail2" $MAKE -e check + TESTS="skip skip2" $MAKE -e check + TESTS="xfail xfail2" $MAKE -e check + TESTS="xpass xpass2" $MAKE -e check + TESTS='pass skip xfail' $MAKE -e check $MAKE check : ) >stdout diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test index fcee60b..82cf605 100755 --- a/tests/instmany-mans.test +++ b/tests/instmany-mans.test @@ -123,6 +123,7 @@ test `find "$instdir" -type f -print | wc -l` = 0 # Try whether we don't exceed the low limit. INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install +# The `env' here is required to avoid spurious failures with Solaris Sh. env save_PATH="$PATH" PATH="`pwd`/..:$PATH" $MAKE uninstall cd $subdir diff --git a/tests/instmany-python.test b/tests/instmany-python.test index 6831c9e..b05fe44 100755 --- a/tests/instmany-python.test +++ b/tests/instmany-python.test @@ -113,6 +113,7 @@ test `find "$instdir" -type f -print | wc -l` = 0 # Try whether we don't exceed the low limit. INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install +# The `env' here is required to avoid spurious failures with Solaris Sh. env save_PATH="$PATH" PATH="`pwd`/..:$PATH" $MAKE uninstall cd $subdir diff --git a/tests/instmany.test b/tests/instmany.test index a3b10cb..3459a90 100755 --- a/tests/instmany.test +++ b/tests/instmany.test @@ -137,6 +137,7 @@ test `find "$instdir" -type f -print | wc -l` = 0 # Try whether we don't exceed the low limit. INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install +# The `env' here is required to avoid spurious failures with Solaris Sh. env save_PATH="$PATH" PATH="`pwd`/..:$PATH" $MAKE uninstall cd $subdir diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test index a49d39c..3f07c9c 100755 --- a/tests/parallel-tests2.test +++ b/tests/parallel-tests2.test @@ -75,10 +75,10 @@ test -f mylog.html # check-html and recheck-html should cause check_SCRIPTS to be created, # and recheck-html should rerun no tests if check has not been run. $MAKE clean -env TESTS=foo.test $MAKE -e check-html +TESTS=foo.test $MAKE -e check-html test -f bla $MAKE clean -env TESTS=foo.test $MAKE -e recheck-html +TESTS=foo.test $MAKE -e recheck-html test -f bla test ! -f foo.log test -f mylog.html diff --git a/tests/subdir10.test b/tests/subdir10.test index c71216b..a9caf7d 100755 --- a/tests/subdir10.test +++ b/tests/subdir10.test @@ -34,6 +34,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE ./configure -env fail=1 $MAKE all clean +fail=1 $MAKE all clean Exit 0 -- 1.6.5
