Merge branch 'test-protocols' into testsuite-work

* test-protocols:
  tests: list "forgotten" test script in TESTS
  ylwrap: fix unusual indentation whitespace

diff --cc ChangeLog
index 8e4e6d74424f4e15b7ca8b79fb0616b191ec2c69,b1e1bdc5e926dfd9ef017ac80cfb9a29692a7e80..468388e72da6364308db9236f4fa798f82bc3787
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,16 +1,30 @@@
+ 2011-08-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: list "forgotten" test script in TESTS
+       * tests/Makefile.am (TESTS): Also list ...
+       * tests/java-empty-classpath.test: ... this test.  Since we are
+       at it, remove trailing whitespace from a couple of lines.
+ 
+ 2011-08-25  Eric Blake  <eblake@redhat.com>
+ 
+       ylwrap: fix unusual indentation whitespace
+       * lib/ylwrap: Convert tabs to spaces.
+       Reported by Karl Berry.
+ 
 +2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: different test scripts cannot share the same basename
 +      If two test scripts have the same basename, they will end up
 +      sharing the same log file, leading to all sort of undefined and
 +      undesired behaviours.  Add a Makefile check verifying that this
 +      is not the case.
 +      * tests/test-logs-repeated.test: New test, verifying previously
 +      unspecified semantics (in the definition of $(TEST_LOGS) from
 +      $(TESTS)) that we use in our new check.
 +      * tests/Makefile.am (TESTS): Update.
 +      (check-no-repeated-test-name): New .PHONY check.
 +      (check-local): Depend on it.
 +
  2011-08-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix spurious failure for awk implementation of TAP driver

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge