summaryrefslogtreecommitdiffstats
path: root/make/scripts/runtest.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-11-29 04:50:16 +0100
committerSven Gothel <[email protected]>2011-11-29 04:50:16 +0100
commit60ea6727f1a089f6afd17fcea3bd7d29353af9b4 (patch)
tree17faa0b8d171f4790f33a1995e1ec1ca209aa216 /make/scripts/runtest.sh
parentb3d5e20c04af353b246c9b2607c145f7dbd508dd (diff)
Add 'TestJarsInJar.jar' test JAR file for upcoming JarUtil tests (Jar in Jar).
Diffstat (limited to 'make/scripts/runtest.sh')
-rwxr-xr-xmake/scripts/runtest.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index 61927e9..fa8d2e0 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -29,7 +29,7 @@ rm -f $LOG
#D_ARGS="-Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true"
#D_ARGS="-Djogamp.debug.TraceLock"
-#D_ARGS="-Djogamp.debug.JARUtil"
+#D_ARGS="-Djogamp.debug.JarUtil"
#D_ARGS="-Djogamp.debug.TempFileCache"
#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JARUtil"
#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false"
@@ -43,8 +43,11 @@ function onetest() {
shift
#libspath=$builddir/obj:$builddir/test/build/natives:
libspath=$builddir/test/build/natives:
- echo LD_LIBRARY_PATH=$libspath:$LD_LIBRARY_PATH java $D_ARGS -Djava.library.path=$libspath -classpath lib/junit.jar:$ANT_JARS:$builddir/gluegen-rt.jar:$builddir/gluegen.jar:$builddir/test/build/classes $clazz
- LD_LIBRARY_PATH=$libspath:$LD_LIBRARY_PATH java $D_ARGS -Djava.library.path=$libspath -classpath lib/junit.jar:$ANT_JARS:$builddir/gluegen-rt.jar:$builddir/gluegen.jar:$builddir/test/build/classes $clazz
+ LD_LIBRARY_PATH=$libspath:$LD_LIBRARY_PATH
+ CLASSPATH=lib/junit.jar:$ANT_JARS:$builddir/../make/lib/TestJarsInJar.jar:$builddir/gluegen-rt.jar:$builddir/gluegen.jar:$builddir/test/build/gluegen-test.jar
+ echo LD_LIBRARY_PATH $LD_LIBRARY_PATH
+ echo CLASSPATH $CLASSPATH
+ java $D_ARGS -Djava.library.path=$libspath $clazz
echo
}
@@ -63,6 +66,7 @@ function onetest() {
#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
#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.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.TestJarUtil 2>&1 | tee -a $LOG