diff options
author | Sven Gothel <sgothel@jausoft.com> | 2013-10-28 03:58:01 +0100 |
---|---|---|
committer | Sven Gothel <sgothel@jausoft.com> | 2013-10-28 03:58:01 +0100 |
commit | bcfaa149b9803ce33c5a356cbcb45f7dfd3e4361 (patch) | |
tree | 296947e2b5a04874b3ce42ab711e8abc0d588e92 /make/build-test.xml | |
parent | f73c10f71be979d214537679f85f1897c5642e11 (diff) |
Bug 776 GLContext Sharing: Add note about driver stability (destruction order) ; Fix unit tests (Shared Gears, wait for created context and destruction order)
- Add note about driver stability (destruction order)
- See GLSharedContextSetter: Don't destroy master context before slaves!
- Fix spec-overview.html#SHARED links, add link to GLSharedContextSetter in SHARED subsection.
- Fix unit tests (Shared Gears, wait for created context and destruction order)
- The GearsObject sharing was completly bogus!
It simply used the _same_ GLArrayDataServer instance for sharing,
but it should use a _copy_ of the shared GLArrayDataServer while
only preserving the VBO object!
Fixed, while adding required methods to GLArrayDataServer.
- Waiting for the created GLContext of a GLAutoDrawable required us
to pass the latter _and_ check whether it's GLContext exists and is natively created.
- Accomodated the destruction order - see above!
Diffstat (limited to 'make/build-test.xml')
-rw-r--r-- | make/build-test.xml | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 066d41401..b7220aed6 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -449,7 +449,45 @@ </junit> </target> - <target name="junit.run.newt.event" depends="test.compile"> + <target name="junit.run.sharedctx" depends="test.compile, junit.run.settings"> + <!-- Test*AWT* --> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <env key="${system.env.library.path}" path="${obj.all.paths}"/> + <jvmarg value="${junit.run.arg0}"/> + <jvmarg value="${junit.run.arg1}"/> + <jvmarg value="${jvmDataModel.arg}"/> + <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + + <!-- + <jvmarg value="-Dnewt.debug.EDT"/> + <jvmarg value="-Djogl.debug=all"/> + <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/> + <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> + <jvmarg value="-Djogl.debug.GLSLState"/> + <jvmarg value="-Dnativewindow.debug=all"/> + <jvmarg value="-Dnewt.debug=all"/> + <jvmarg value="-verbose:jni"/> + <jvmarg value="-client"/> + <jvmarg value="-d32"/> + --> + + <formatter usefile="false" type="plain"/> + <formatter usefile="true" type="xml"/> + <!--classpath refid="junit_jogl_awt.run.classpath"/--> + <classpath refid="junit_jogl_swt.run.classpath"/> + + <batchtest todir="${results.test}"> + <fileset dir="${classes}"> + <include name="${java.dir.junit}/**/acore/TestSharedContextVBO**"/> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + </target> + + <target name="junit.run.newt.event" depends="test.compile, junit.run.settings"> <!-- Test*AWT* --> <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> @@ -487,7 +525,7 @@ </junit> </target> - <target name="junit.run.newt.monitormode" depends="test.compile"> + <target name="junit.run.newt.monitormode" depends="test.compile, junit.run.settings"> <!-- Test*AWT* --> <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> |