diff options
-rw-r--r-- | make/build-common.xml | 3 | ||||
-rw-r--r-- | make/build-test.xml | 4 | ||||
-rw-r--r-- | make/scripts/tests.sh | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 35b3be7e1..4f7a709c6 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -605,7 +605,7 @@ <!-- Test Compilation .. --> - <path id="junit_jogl_newt.compile.classpath"> + <path id="junit_joal_jogl_newt.compile.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> @@ -613,6 +613,7 @@ <pathelement location="${semver.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${gluegen-test-util.jar}" /> + <pathelement location="${joal.jar}" /> <pathelement location="${swt.jar}" /> <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" /> <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" /> diff --git a/make/build-test.xml b/make/build-test.xml index 689e3382f..ae3daacfe 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -103,7 +103,7 @@ target="${target.targetlevel}" bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - <classpath refid="junit_jogl_newt.compile.classpath"/> + <classpath refid="junit_joal_jogl_newt.compile.classpath"/> <src path="${src.demos}" /> </javac> <copy file="joglversion-test" @@ -208,7 +208,7 @@ target="${target.targetlevel}" bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - <classpath refid="junit_jogl_newt.compile.classpath"/> + <classpath refid="junit_joal_jogl_newt.compile.classpath"/> <src path="${src.test}" /> </javac> </target> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 01c758ee1..6b96625f5 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -366,6 +366,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLContext" #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogamp.debug.AudioSink" + #D_ARGS="-Djogamp.debug.AudioSink -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogamp.debug.AudioSink -Djoal.openal.lib=system" #D_ARGS="-Djogamp.debug.AudioSink -Djoal.debug.AudioSink.trace" #D_ARGS="-Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.AudioSink -Djogl.debug.GLMediaPlayer" @@ -993,9 +994,9 @@ function testawtswt() { #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo03 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo10 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo11 $* -#testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo20 $* +testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo20 $* -testnoawt com.jogamp.opengl.demos.av.MovieCube $* +#testnoawt com.jogamp.opengl.demos.av.MovieCube $* #testnoawt com.jogamp.opengl.demos.av.MovieSimple $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLReadBuffer01GLWindowNEWT $* |