diff options
| author | Sven Gothel <[email protected]> | 2019-07-08 04:27:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-07-08 04:27:18 +0200 |
| commit | f006cb6a0794c0d4fdfc59ded579fc3d91551d0b (patch) | |
| tree | 72ab9db95732db0aa35a2c0bb97128678c365cd8 /make | |
| parent | 9a12ff413a216b7d591950e9d5fc9a261786bc00 (diff) | |
Fix build test jar regression (commit bba73bc096250a3c7fc036d84b1ea054d1b70b06)
java.part.test.all was erroneously removed, redefined.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 1 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 547a0d8d1..320a1d37d 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -29,6 +29,7 @@ <property name="classes.demos" value="${build.demos}/classes" /> <property name="java.part.demo.mobile" value="com/jogamp/opengl/demos/demos/**"/> + <property name="java.part.test.all" value="com/jogamp/opengl/test/** jogamp/**"/> <property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/> <property name="java.part.test.oculusvr" value="com/jogamp/opengl/test/junit/jogl/stereo/ovr/**"/> <property name="java.dir.test" value="com/jogamp/opengl/test"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 0342f7da3..abb03238f 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -99,7 +99,7 @@ function jrun() { swton=$1 shift - D_ARGS="-Djogl.debug.GLProfile" + #D_ARGS="-Djogl.debug.GLProfile" #D_ARGS="-Djogl.debug.DebugGL" #D_ARGS="-Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL" @@ -438,7 +438,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile02NEWTNoARBCtx $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $* @@ -454,7 +454,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $* # # HiDPI # -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* |