test scripts: add argument for java data-type (32 or 64 bit) ; Add OSX 32/64 bit test script.

8 files changed, 21 insertions, 20 deletions

diff --git a/make/scripts/tests-armv7l_eabi.sh b/make/scripts/tests-armv7l_eabi.sh
index e7e327075..2ed3070b4 100755
--- a/make/scripts/tests-armv7l_eabi.sh
+++ b/make/scripts/tests-armv7l_eabi.sh
@@ -2,6 +2,6 @@
 
 spath=`dirname $0`
 
-. $spath/tests.sh  `which java` ../build-armv7l_eabi $*
+. $spath/tests.sh  `which java` -DummyArg ../build-armv7l_eabi $*
 
 
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
new file mode 100755
index 000000000..e50266828
--- /dev/null
+++ b/make/scripts/tests-osx-x64.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+spath=`dirname $0`
+
+. $spath/tests.sh  /usr/bin/java -d64 ../build-macosx $*
+
+
diff --git a/make/scripts/tests-osx.sh b/make/scripts/tests-osx.sh
deleted file mode 100755
index c6e83367f..000000000
--- a/make/scripts/tests-osx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-spath=`dirname $0`
-
-. $spath/tests.sh  /usr/bin/java ../build-macosx $*
-
-
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
index 26b7c14bb..996dcc606 100755
--- a/make/scripts/tests-solx32.sh
+++ b/make/scripts/tests-solx32.sh
@@ -6,5 +6,5 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
-. $SDIR/tests.sh  `which java` ../build-solaris-x86 $*
+. $SDIR/tests.sh  `which java` -d32 ../build-solaris-x86 $*
 
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
index b5667e508..3500f1b14 100755
--- a/make/scripts/tests-solx64.sh
+++ b/make/scripts/tests-solx64.sh
@@ -6,5 +6,5 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
-. $SDIR/tests.sh  `which java` ../build-solaris-x86_64 $*
+. $SDIR/tests.sh  `which java` -d64 ../build-solaris-x86_64 $*
 
diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh
index 8ac1dc51b..a3aed84c3 100755
--- a/make/scripts/tests-x32.sh
+++ b/make/scripts/tests-x32.sh
@@ -6,6 +6,6 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
-. $SDIR/tests.sh  `which java` ../build-x86 $*
+. $SDIR/tests.sh  `which java` -d32 ../build-x86 $*
 
 
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index 1816f59f9..ba7048988 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -6,5 +6,5 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
-. $SDIR/tests.sh  `which java` ../build-x86_64 $*
+. $SDIR/tests.sh  `which java` -d64 ../build-x86_64 $*
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 6e319e0b0..9f3e7ea92 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -1,12 +1,14 @@
 #! /bin/bash
 
-if [ -z "$1" -o -z "$2" ] ; then
-    echo Usage $0 java-exe build-dir
+if [ -z "$1" -o -z "$2" -o -z "$3" ] ; then
+    echo Usage $0 java-exe java-xargs build-dir
     exit 0
 fi
 
 javaexe=$1
 shift
+javaxargs=$1
+shift
 bdir=$1
 shift
 
@@ -39,7 +41,7 @@ echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.
 echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log
 echo SWT_CLASSPATH: $SWT_CLASSPATH 2>&1 | tee -a java-run.log
-echo $javaexe $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
+echo $javaexe $javaxargs $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
 echo MacOsX $MOSX
 
 function jrun() {
@@ -134,13 +136,13 @@ function jrun() {
     echo
     echo LD_LIBRARY_PATH $LD_LIBRARY_PATH
     echo
-    echo $javaexe $X_ARGS $D_ARGS $C_ARG $*
+    echo $javaexe $javaxargs $X_ARGS $D_ARGS $C_ARG $*
     #LD_LIBRARY_PATH=/usr/local/projects/Xorg.modular/build-x86_64/lib:$LD_LIBRARY_PATH \
     #LD_LIBRARY_PATH=/opt-linux-x86_64/x11lib-1.3:$LD_LIBRARY_PATH \
     #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64:$LD_LIBRARY_PATH \
     #LIBGL_DRIVERS_PATH=/usr/lib/mesa:/usr/lib32/mesa \
     #LD_LIBRARY_PATH=/usr/lib/mesa:/usr/lib32/mesa:$LD_LIBRARY_PATH \
-    $javaexe $X_ARGS $D_ARGS $C_ARG $*
+    $javaexe $javaxargs $X_ARGS $D_ARGS $C_ARG $*
     echo
     echo "Test End: $*"
     echo
@@ -175,7 +177,6 @@ function testswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT2 $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES1NEWT $*
@@ -212,7 +213,7 @@ function testswt() {
 #testawt jogamp.newt.awt.opengl.VersionApplet $*
 #testawt javax.media.opengl.awt.GLCanvas $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT01GLn $*
+testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT01GLn $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextNewtAWTBug523 $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestPBufferDeadlockAWT $*
@@ -253,7 +254,7 @@ function testswt() {
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02AWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting03AWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingFocusTraversal01AWT $*
-testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer01GLCanvasAWT $*
+#testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer01GLCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer02NewtCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentParentingAWT $*
 #testawt com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT