Fix the $JAVAC conditional in tests/all

Add a test script for all Java tests, called "alljava".

Include testconfig.sh in testdefs.sh, not testdefs_java.sh, so that the
tests/all script can successfully test the $JAVAC variable.

testdefs.sh

@@ -35,7 +35,7 @@ else
    exit 1
 fi
 
-source "$servald_build_root/testconfig.sh"
+source "$servald_build_root/testconfig.sh" || exit 1
 
 export PATH="$servald_build_root:$PATH"
 export TFW_LOGDIR="${SERVAL_TEST_LOGDIR:-$servald_build_root/testlog}"

testdefs_java.sh

@@ -16,11 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-testdefs_java_sh=$(abspath "${BASH_SOURCE[0]}")
-java_source_root="${testdefs_java_sh%/*}"
-java_build_root="$java_source_root"
-java_classdir="$java_build_root/java-api/classes"
-java_testclassdir="$java_build_root/java-api/testclasses"
+java_build_root="${servald_build_root?}/java-api"
+java_classdir="$java_build_root/classes"
+java_testclassdir="$java_build_root/testclasses"
 
 # Utility function for setting up servald JNI fixtures:
 #  - check that libservaldaemon.so is present

tests/all

@@ -41,10 +41,7 @@ includeTests rhizomerestful
 includeTests meshmsrestful
 includeTests meshmbrestful
 if type -p "$JAVAC" >/dev/null; then
-   includeTests jni
-   includeTests keyringjava
-   includeTests rhizomejava
-   includeTests meshmsjava
+   includeTests alljava
 fi
 
 runTests "$@"