Merge branch 'maint' into java-work

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

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index cbd5b654c6f7cd12d197b211d1b3eb5d184a7c72,a1c67ffc3a3fa6fc9e33f7a3b5238f29ec989ded..a93f4f86ff13306b06cb3f947c91b40064897c17
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -445,21 -444,9 +445,22 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
 +java-clean.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +javaflags.test \
 +java-extra.test \
 +java-noinst.test \
 +java-nobase.test \
 +java-compile-install.test \
 +java-compile-run-flat.test \
 +java-compile-run-nested.test \
 +java-sources.test \
 +java-no-duplicate.test \
 +java-mix.test \
 +java-uninstall.test \
 +java-rebuild.test \
  ldadd.test \
  ldflags.test \
  lex.test \

diff --cc tests/Makefile.in
index 2fc45d195e44b985188379d69e35ab5bbb64508c,4b2d8457d4e62addf93de6f86c8ffdcc0e9581aa..434644d1bc2b502ff05763c4f13e44679176c9bd
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -723,21 -722,9 +723,25 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
++<<<<<<< HEAD
 +java-clean.test \
++=======
+ java-empty-classpath.test \
++>>>>>>> maint
  javaprim.test \
  javasubst.test \
 +javaflags.test \
 +java-extra.test \
 +java-noinst.test \
 +java-nobase.test \
 +java-compile-install.test \
 +java-compile-run-flat.test \
 +java-compile-run-nested.test \
 +java-sources.test \
 +java-no-duplicate.test \
 +java-mix.test \
 +java-uninstall.test \
 +java-rebuild.test \
  ldadd.test \
  ldflags.test \
  lex.test \