diff options
| -rw-r--r-- | make/build-test.xml | 5 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-armv7-cross.sh | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index dd3db3e14..7433433ad 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -651,7 +651,7 @@ ${line.separator} <!-- target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/ --> - <target name="junit.run.settings"> + <target name="junit.run.settings" depends="declare.common"> <delete quiet="true"> <fileset dir="${results.test}" includes="**"/> <fileset dir="${build}/test/results-x32" includes="**"/> @@ -661,7 +661,8 @@ ${line.separator} <mkdir dir="${results.test}" /> </target> - <target name="junit.run" depends="declare.common, junit.run.settings, junit.run.tests"> + <target name="junit.run" depends="junit.run.settings" unless="junit.is.disabled"> + <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/> <mkdir dir="${results.test}" /> <move todir="${results.test}"> <fileset dir="." includes="*.tga" /> diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh index 1f9497e25..e3209d899 100755 --- a/make/scripts/make.jogl.all.linux-armv7-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh @@ -33,6 +33,7 @@ export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7.xml" +#export JUNIT_DISABLED="true" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" ant \ |