From 16d4a6d18e802ae7e215679d13210e43d4175e1f Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Wed, 20 Dec 2017 11:10:19 +1030 Subject: [PATCH] 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 | 2 +- testdefs_java.sh | 8 +++----- tests/all | 5 +---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/testdefs.sh b/testdefs.sh index 3799e2d6..8345c11a 100644 --- a/testdefs.sh +++ b/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}" diff --git a/testdefs_java.sh b/testdefs_java.sh index e10feeb6..f628c16b 100644 --- a/testdefs_java.sh +++ b/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 diff --git a/tests/all b/tests/all index 447a18c8..3366b4ea 100755 --- a/tests/all +++ b/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 "$@"