diff options
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x[-rw-r--r--] | make/scripts/adb-uninstall-all.sh | 3 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 18 | ||||
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 7 |
3 files changed, 26 insertions, 2 deletions
diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh index 9973ef4..63606a1 100644..100755 --- a/make/scripts/adb-uninstall-all.sh +++ b/make/scripts/adb-uninstall-all.sh @@ -1 +1,2 @@ -adb uninstall com.jogamp.common +adb $* uninstall jogamp.android.launcher +adb $* uninstall com.jogamp.common diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 547a17f..83c21b9 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -8,6 +8,11 @@ if [ -z "$builddir" ] ; then exit 1 fi +if [ -e /opt-share/apache-ant ] ; then + ANT_PATH=/opt-share/apache-ant + PATH=$ANT_PATH/bin:$PATH + export ANT_PATH +fi if [ -z "$ANT_PATH" ] ; then TMP_ANT_PATH=$(dirname `which ant`)/.. if [ -e $TMP_ANT_PATH/lib/ant.jar ] ; then @@ -17,6 +22,13 @@ if [ -z "$ANT_PATH" ] ; then fi fi if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then echo ANT_PATH does not exist, set it print_usage exit @@ -37,6 +49,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.Lock" #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.Lock.TraceLock" +D_ARGS="-Djogamp.debug.IOUtil" function onetest() { clazz=$1 @@ -71,5 +84,8 @@ function onetest() { #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG +#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG +#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG +onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index 4003e8b..d92419b 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -15,6 +15,13 @@ if [ -z "$ANT_PATH" ] ; then fi fi if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then echo ANT_PATH does not exist, set it exit fi |