Merge branch 'maint'

* maint:
  tests: list "forgotten" test script in TESTS

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index 8502409748123f26f19ef68d1c48c44adc56b48e,a1c67ffc3a3fa6fc9e33f7a3b5238f29ec989ded..a194f44573b6e8e1549b8c8121355f67cd6e75be
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -544,10 -444,9 +544,11 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \

diff --cc tests/Makefile.in
index 5b5714123621d2815a0e91f69aaac31513fc9151,4b2d8457d4e62addf93de6f86c8ffdcc0e9581aa..7fe2c93866d5fff71bc119fccfc5d4ec515f5375
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -817,10 -722,9 +817,11 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \