Re: [PATCH v4 3/3] parallel-tests: allow each test to have multiple results

[Stefano Lattarini]

On Friday 17 June 2011, Stefano Lattarini wrote:
> And attached is what I've squashed in.
> 
> Regards,
>   Stefano
> 
And this further squash-in is required to fix a spurious failure due
to the rename pt-driver -> test-driver.

Sorry for the noise,
  Stefano

-*-*-

  diff --git a/ChangeLog b/ChangeLog
  index 0b0694d..cff9c42 100644
  --- a/ChangeLog
  +++ b/ChangeLog
  @@ -17,7 +17,8 @@
        `:test-result:' in the generated log file.  Use a reStructuredText
        transition to better separate the test outcome report from the
        test script's registered output.  Improve comments.
  -     * tests/test-driver-custom-xfail-tests.test: Adapt.
  +     * tests/test-driver-custom-xfail-tests.test: Adjust.
  +     * tests/parallel-tests7.test: Adjust.
        * tests/parallel-tests-empty-testlogs.test: New test.
        * tests/parallel-tests-recheck-override.test: Likewise.
        * tests/parallel-tests2.test: Extend and keep more in-sync with ...
  diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test
  index c29d32c..40fc4a5 100755
  --- a/tests/parallel-tests7.test
  +++ b/tests/parallel-tests7.test
  @@ -30,9 +30,9 @@ cat > Makefile.am << 'END'
   TESTS = foo.chk bar.test $(check_PROGRAMS) sub/test
   check_PROGRAMS = baz bla.test bli.suff
   TEST_EXTENSIONS = .chk .test
  -CHK_LOG_COMPILER = ./chk-driver
  -TEST_LOG_COMPILER = ./test-driver
  -LOG_COMPILER = ./noext-driver
  +CHK_LOG_COMPILER = ./chk-compiler
  +TEST_LOG_COMPILER = ./test-compiler
  +LOG_COMPILER = ./noext-compiler
   AM_CHK_LOG_FLAGS = 1
   CHK_LOG_FLAGS = 2
   AM_TEST_LOG_FLAGS = 3
  @@ -43,7 +43,7 @@ END
   
   mkdir sub
   
  -cat >chk-driver <<'END'
  +cat >chk-compiler <<'END'
   #! /bin/sh
   echo $0 "$@"
   shift
  @@ -51,9 +51,9 @@ shift
   exec "$@"
   exit 127
   END
  -chmod a+x chk-driver
  -cp chk-driver test-driver
  -cp chk-driver noext-driver
  +chmod a+x chk-compiler
  +cp chk-compiler test-compiler
  +cp chk-compiler noext-compiler
   
   cat >foo.chk << 'END'
   #! /bin/sh
  @@ -79,10 +79,10 @@ $AUTOMAKE -a
   ./configure
   $MAKE
   $MAKE check
  -grep 'chk-driver  *1  *2' foo.log
  -grep 'test-driver  *3  *4' bar.log
  -grep 'noext-driver  *5  *6' baz.log
  -grep 'test-driver  *3  *4' bla.log
  -grep 'noext-driver  *5  *6' bli.suff.log
  -grep 'noext-driver  *5  *6' sub/test.log
  +grep 'chk-compiler  *1  *2' foo.log
  +grep 'test-compiler  *3  *4' bar.log
  +grep 'noext-compiler  *5  *6' baz.log
  +grep 'test-compiler  *3  *4' bla.log
  +grep 'noext-compiler  *5  *6' bli.suff.log
  +grep 'noext-compiler  *5  *6' sub/test.log
   :