From f948f8e12e0439a239e7362b446fe37e9af3ce40 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Thu, 19 Jun 2014 11:38:39 +0930
Subject: [PATCH] Include Java tests in 'tests/all' if Java compiler available

---
 testdefs_java.sh | 2 +-
 tests/all        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/testdefs_java.sh b/testdefs_java.sh
index 8db580cb..d905fe91 100644
--- a/testdefs_java.sh
+++ b/testdefs_java.sh
@@ -26,7 +26,7 @@ setup_servald_so() {
 }
 
 compile_java_classes() {
-   assert --message='Java compiler was detected by ./configure' [ "$JAVAC" ]
+   assert --message='Java compiler was detected by ./configure' type -p "$JAVAC" >/dev/null
    mkdir classes
    assert find "$servald_source_root"/java/ -name *.java | xargs $JAVAC -Xlint:unchecked -d classes
    assert [ -r classes/org/servalproject/servaldna/ServalDCommand.class ]
diff --git a/tests/all b/tests/all
index 74fe16dc..e78d37f8 100755
--- a/tests/all
+++ b/tests/all
@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 source "${0%/*}/../testframework.sh"
+source "${0%/*}/../testconfig.sh"
 
 includeTests logging
 includeTests config
@@ -35,5 +36,9 @@ includeTests rhizomehttp
 includeTests meshms
 includeTests directory_service
 includeTests vomp
+if type -p "$JAVAC" >/dev/null; then
+   includeTests jni
+   includeTests meshmsjava
+fi
 
 runTests "$@"