testsuite: fix a spurious failure

* tests/parallel-tests-ext-driver.test: Exporting of environment
variables directly from $(LOG_COMPILER) variables is not allowed
anymore.  Adjust to this.

diff --git a/ChangeLog b/ChangeLog
index ad8c02394525e3b9b2312234a43cf409274c171d..4ccef0ca74fa4b1dc7ac8eb08b5b431d27b63eba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       testsuite: fix a spurious failure
+       * tests/parallel-tests-ext-driver.test: Exporting of environment
+       variables directly from $(LOG_COMPILER) variables is not allowed
+       anymore.  Adjust to this.
+
 2011-08-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        testsuite: yet more use of TAP, and related extensions

diff --git a/tests/parallel-tests-ext-driver.test b/tests/parallel-tests-ext-driver.test
index 44d760658297c5ceb7903221ce596e22ee412a74..5fa44995f268fc8eec851d13006f2dc4c1af8de4 100755 (executable)
--- a/tests/parallel-tests-ext-driver.test
+++ b/tests/parallel-tests-ext-driver.test
@@ -35,8 +35,8 @@ TESTS = foo.chk bar.test baz bla.t bli.suff sub/test
 
 TEST_EXTENSIONS = .chk .test .t
 
-CHK_LOG_COMPILER = CHK=ok; export CHK; ./chk-driver
-TEST_LOG_COMPILER = CHK=ok $(SHELL) $(srcdir)/test-driver
+CHK_LOG_COMPILER = ./chk-driver
+TEST_LOG_COMPILER = $(SHELL) $(srcdir)/test-driver
 T_LOG_COMPILER = @acsubst_driver@
 LOG_COMPILER = @SHELL@ -x $(srcdir)/noext-driver
 
@@ -55,8 +55,6 @@ LOG_FLAGS = -b
 EXTRA_DIST = $(TESTS) chk-driver test-driver noext-driver
 END
 
-unset CHK || :
-
 mkdir sub
 
 cat > chk-driver <<'END'
@@ -65,10 +63,6 @@ test x"$1" = x"--chk" || {
   echo "$0: invalid command line: $*" >&2
   exit 1
 }
-test x"$CHK" = x"ok" || {
-  echo "$0: bad \$CHK value '$CHK'" >&2
-  exit 1
-}
 shift
 exec "$@"
 exit 127
@@ -84,10 +78,6 @@ if test x"$1,$2" != x"--am-t,--t"; then
   echo "$0: invalid command line: $*" >&2
   exit 1
 fi
-if test x${CHK+"set"} = x"set"; then
-  echo "$0: $CHK is set in the environment" >&2
-  exit 1
-fi
 shift; shift
 exec "$@"
 exit 127