summaryrefslogtreecommitdiffstats
path: root/make/scripts
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-01-05 08:55:06 +0100
committerSven Gothel <[email protected]>2012-01-05 08:55:06 +0100
commit9a211fe6cfb4150d97b50325c1778b7f5d3419af (patch)
treefc37b492bc29a77286ca7b185029d48e96720e56 /make/scripts
parent3eb4fd96cd65e49625663fdb6421a2f1cf2204dc (diff)
Further fix for bug 537 - Catch IllegalArgumentException in Platform.loadGlueGenRTImpl(), Reuse JarUtil (same methodology) to determine whether we run from JarURL
Diffstat (limited to 'make/scripts')
-rwxr-xr-xmake/scripts/runtest.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index 7968dc0..547a17f 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -41,10 +41,11 @@ rm -f $LOG
function onetest() {
clazz=$1
shift
- #libspath=$builddir/obj:$builddir/test/build/natives:
+ CLASSPATH=lib/junit.jar:$ANT_JARS:$builddir/../make/lib/TestJarsInJar.jar:$builddir/gluegen-rt.jar:$builddir/gluegen.jar:$builddir/test/build/gluegen-test.jar
libspath=$builddir/test/build/natives:
+ #CLASSPATH=lib/junit.jar:$ANT_JARS:$builddir/../make/lib/TestJarsInJar.jar:$builddir/classes:$builddir/test/build/classes
+ #libspath=$builddir/obj:$builddir/test/build/natives:
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
echo java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz