From e04ec76678486f1b251ed4d907a924d53aafce52 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 5 Aug 2011 17:44:35 +0200 Subject: add/fix: cross/egl test scripts --- make/scripts/crosstest-java-android-armv7-rel.sh | 69 ++++++++++++++++++++++++ make/scripts/crosstest-java-linux-armv7-rel.sh | 6 +-- make/scripts/eglestest-java-linux.sh | 8 +-- 3 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 make/scripts/crosstest-java-android-armv7-rel.sh diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh new file mode 100644 index 000000000..d4c93d7c8 --- /dev/null +++ b/make/scripts/crosstest-java-android-armv7-rel.sh @@ -0,0 +1,69 @@ +#! /bin/bash + +export HOST_UID=sven +export HOST_IP=192.168.0.52 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=beagle02 +export TARGET_ROOT=/projects + +export BUILD_DIR=../build-android-armv7 + +if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH +fi + +# +# orig android: +# export LD_LIBRARY_PATH /system/lib +# export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar +# + +#TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion +#TSTCLASS=com.jogamp.opengl.JoglVersion +#TSTCLASS=com.jogamp.newt.NewtVersion +TSTCLASS=com.jogamp.newt.opengl.GLWindow +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 +#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 +#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT + + +LOGFILE=`basename $0 .sh`.log + +# -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \ +# -Djava.class.path=lib/ant-junit-all.apk:$BUILD_DIR/gluegen-rt.apk \ +# -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \ + +RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \ + --delete-excluded" + +echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh + +echo "\ +rsync -av --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \ +cd $TARGET_ROOT/jogl/make ; +export LD_LIBRARY_PATH=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$TARGET_ROOT/jogl/make/$BUILD_DIR/lib ; \ +export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ; \ +dalvikvm \ + -Xjnigreflimit:2000 \ + -cp ../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/test/build/jogl.test.jar \ + -Djogamp.debug.JNILibLoader=true \ + -Djogamp.debug.NativeLibrary=true \ + -Djogamp.debug.NativeLibrary.Lookup=true \ + -Djogl.debug=all \ + com.android.internal.util.WithFramework \ + $TSTCLASS \ +" >> $BUILD_DIR/targetcommand.sh + +chmod ugo+x $BUILD_DIR/targetcommand.sh +adb push $BUILD_DIR/targetcommand.sh $TARGET_ROOT/targetcommand.sh +adb shell $TARGET_ROOT/targetcommand.sh 2>&1 | tee $LOGFILE + diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh index 5a1aeeb82..c274dab18 100644 --- a/make/scripts/crosstest-java-linux-armv7-rel.sh +++ b/make/scripts/crosstest-java-linux-armv7-rel.sh @@ -13,7 +13,7 @@ export ANT_PATH=/usr/share/ant #TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion #TSTCLASS=com.jogamp.opengl.JoglVersion -#TSTCLASS=com.jogamp.newt.NewtVersion +TSTCLASS=com.jogamp.newt.NewtVersion #TSTCLASS=com.jogamp.newt.opengl.GLWindow #TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT @@ -22,7 +22,7 @@ export ANT_PATH=/usr/share/ant #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 -TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT LOGFILE=`basename $0 .sh`.log @@ -30,7 +30,7 @@ LOGFILE=`basename $0 .sh`.log # -Djogamp.debug.ProcAddressHelper=true \ RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \ - --exclude 'classes/' --exclude 'src/' --exclude '.git/' \ + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \ --delete-excluded" CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar diff --git a/make/scripts/eglestest-java-linux.sh b/make/scripts/eglestest-java-linux.sh index 399da11b5..521a5fb4c 100644 --- a/make/scripts/eglestest-java-linux.sh +++ b/make/scripts/eglestest-java-linux.sh @@ -20,6 +20,7 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2E LOGFILE=`basename $0 .sh`.log +# -Djogamp.debug.NativeLibrary=true \ # -Djogamp.debug.NativeLibrary.Lookup=true \ # -Djogamp.debug.ProcAddressHelper=true \ # -Djogamp.debug=all \ @@ -28,13 +29,14 @@ LOGFILE=`basename $0 .sh`.log # -Dnewt.debug=all \ CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar -CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar +CP_JOGL_ALL=$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/test/build/jogl.test.jar +CP_JOGL_MOBILE=$BUILD_DIR/jar/jogl.all-mobile.jar:$BUILD_DIR/test/build/jogl.test.jar export DISPLAY=:0.0 ; java \ -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ - -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES \ + -Djava.class.path=$CP_BASE:$CP_JOGL_MOBILE \ + -Djogamp.debug.NativeLibrary=true \ $TSTCLASS $* \ 2>&1 | tee $LOGFILE \ -- cgit v1.2.3