Include Java tests in 'tests/all' if Java compiler available

This commit is contained in:
Andrew Bettison 2014-06-19 11:38:39 +09:30
parent b14c58bdf6
commit f948f8e12e
2 changed files with 6 additions and 1 deletions

View File

@ -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 ]

View File

@ -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 "$@"