Test: Added commented-out hacks for gdb invocation, OSX NSZombieEnabled env, and custom lib path; MovieCube: '-wait' to wait for debugger.

4 files changed, 24 insertions, 4 deletions

diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index e50266828..748cf39a9 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
+
 spath=`dirname $0`
 
 . $spath/tests.sh  /usr/bin/java -d64 ../build-macosx $*
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index ba7048988..c3c67624c 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -2,6 +2,8 @@
 
 SDIR=`dirname $0` 
 
+#export LD_LIBRARY_PATH=/home/sven/libav/lib:$LD_LIBRARY_PATH
+
 if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index ff789e68a..4426d2c4e 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -32,6 +32,7 @@ MOSX=0
 MOSX_MT=0
 uname -a | grep -i Darwin && MOSX=1
 if [ $MOSX -eq 1 ] ; then
+    #export NSZombieEnabled=YES
     MOSX_MT=1
 fi
 
@@ -62,6 +63,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.TraceGL -Djogl.debug.DebugGL -Djogl.debug.GLSLCode -Djogl.debug.GLSLState"
     #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.TraceGL -Djogl.debug.DebugGL -Djogl.debug.GLSLCode"
+    #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer -Djogamp.gluegen.UseTempJarCache=false"
     D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer"
     #D_ARGS="-Djogl.debug.GLArrayData"
     #D_ARGS="-Djogl.debug.EGL -Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable"
@@ -169,6 +171,7 @@ function jrun() {
     #LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/mesa:/usr/lib/i386-linux-gnu/mesa:$LD_LIBRARY_PATH \
     #LD_LIBRARY_PATH=$spath/../lib/PVRVFrame/OGLES-2.0/Linux_x86_64:$LD_LIBRARY_PATH \
     #LD_LIBRARY_PATH=$spath/../lib/PVRVFrame/OGLES-2.0/Linux_x86_32:$LD_LIBRARY_PATH \
+    #gdb --args $javaexe $javaxargs $X_ARGS $D_ARGS $C_ARG $*
     $javaexe $javaxargs $X_ARGS $D_ARGS $C_ARG $*
     echo
     echo "Test End: $*"
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
index 9ecb15018..090b947d9 100755
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
@@ -33,7 +33,9 @@
 
 package com.jogamp.opengl.test.junit.jogl.demos.es2.av;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -61,6 +63,7 @@ import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener;
 import com.jogamp.opengl.util.av.GLMediaPlayerFactory;
 
 public class MovieCube implements GLEventListener, GLMediaEventListener {
+    static boolean waitForKey = false;
     GLWindow window;
     boolean quit = false;
     TexCubeES2 cube=null;
@@ -128,6 +131,13 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
         GL2ES2 gl = drawable.getGL().getGL2ES2();
         System.err.println(JoglVersion.getGLInfo(gl, null));
 
+        if(waitForKey) {
+            BufferedReader stdin = new BufferedReader(new InputStreamReader(System.in));
+            System.err.println("Press enter to continue");
+            try {
+                System.err.println(stdin.readLine());
+            } catch (IOException e) { }
+        }
         try {
             System.out.println("p0 "+mPlayer);
             mPlayer.initGLStream(gl, stream);
@@ -159,6 +169,7 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
     }
 
     public void dispose(GLAutoDrawable drawable) {
+        System.err.println(Thread.currentThread()+" MovieCube.dispose ... ");
         if(null == mPlayer) { return; }
         mPlayer.stop();
         GL2ES2 gl = drawable.getGL().getGL2ES2();
@@ -176,7 +187,7 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
     public void displayChanged(javax.media.opengl.GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {
     }
     
-    public static void main(String[] args) throws MalformedURLException, IOException {
+    public static void main(String[] args) throws MalformedURLException, IOException, InterruptedException {
         int width = 510;
         int height = 300;
         System.err.println("TexCubeES2.run()");
@@ -192,6 +203,8 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
             } else if(args[i].equals("-url")) {
                 i++;
                 url_s = args[i];
+            } else if(args[i].equals("-wait")) {
+                waitForKey = true;
             }
         }
         final MovieCube mc = new MovieCube(new URL(url_s).openConnection(), -2.3f, 0f, 0f);
@@ -202,15 +215,15 @@ public class MovieCube implements GLEventListener, GLMediaEventListener {
         window.setFullscreen(false);
         window.setSize(width, height);
         window.addGLEventListener(mc);
-        window.setVisible(true);
         final Animator anim = new Animator(window);
-        // anim.setUpdateFPSFrames(60, System.err);
-        anim.start();
         window.addWindowListener(new WindowAdapter() {
             public void windowDestroyed(WindowEvent e) {
                 anim.stop();
             }                
         });
+        // anim.setUpdateFPSFrames(60, System.err);
+        anim.start();
+        window.setVisible(true);
     }
 }