From ee56418cefd891f7dbc2d156a955825fa5a15b3b Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Fri, 26 Aug 2016 14:02:00 -0700 Subject: [PATCH] Undo compile Java classes into target folder. This was causing class loader errors on Java 1.6. Change-Id: Id1d9e7e369aad639115664c43a867c4d3a82f9f1 Tested: on Linux. --- tests/JavaTest.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/JavaTest.sh b/tests/JavaTest.sh index bf37354b1..344bd1c0b 100755 --- a/tests/JavaTest.sh +++ b/tests/JavaTest.sh @@ -19,20 +19,11 @@ echo Compile then run the Java test. testdir=$(readlink -fn `dirname $0`) thisdir=$(readlink -fn `pwd`) -targetdir=${testdir}/target - if [[ "$testdir" != "$thisdir" ]]; then echo error: must be run from inside the ${testdir} directory echo you ran it from ${thisdir} exit 1 fi -if [ -e "${targetdir}" ]; then - echo "clean target" - rm -fr ${targetdir} -fi - -mkdir ${targetdir} - -javac -d ${targetdir} -classpath ${testdir}/../java:${testdir}:${testdir}/namespace_test JavaTest.java -java -classpath ${targetdir} JavaTest +javac -classpath ${testdir}/../java:${testdir}:${testdir}/namespace_test JavaTest.java +java -classpath ${testdir}/../java:${testdir}:${testdir}/namespace_test JavaTest