diff options
author | Sven Gothel <[email protected]> | 2013-06-19 04:44:14 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-06-19 04:44:14 +0200 |
commit | 4376174ad35fdaf76f59430328582e913f468674 (patch) | |
tree | eb1faa41eb440b1fec0c5f9932007050e5bd7e8b /make/scripts | |
parent | 88dca02541d96f68a892ae7824e9e1b29793ae55 (diff) |
Fix Bug 757: Regression of URL to URI conversion (Encoded path not compatible w/ file scheme.
Regression of (Bug 683, Commit b98825eb7cfb61aead4a7dff57471cd2d2c26823).
The URI encoded path cannot be read by File I/O (if file scheme), since the latter
requests an UTF8/16 name, not an URI encoded name (i.e. %20 for space).
The encoded URL is produced if calling 'uri.toURL()' and hence
the new 'IOUtil.toURL(URI)' provides a custom conversion recovering the UTF name via 'new File(uri).getPath()'.
Tested w/
- synthetic URI/URL coposition (unit test)
- manual w/ moving 'build' to 'build öä lala' for gluegen, joal and jogl.
+++
Misc.:
- 'URI JarUtil.getURIDirname(URI)' -> 'URI IOUtil.getDirname(URI)'
++
Diffstat (limited to 'make/scripts')
-rwxr-xr-x | make/scripts/runtest.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 65b3573..a049a8f 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -1,6 +1,6 @@ #! /bin/bash -builddir=$1 +builddir="$1" shift if [ -z "$builddir" ] ; then @@ -56,18 +56,20 @@ rm -f $LOG #D_ARGS="-Djogamp.debug=all" function onetest() { - 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: + 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 DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH export LD_LIBRARY_PATH DYLD_LIBRARY_PATH echo LD_LIBRARY_PATH $LD_LIBRARY_PATH echo CLASSPATH $CLASSPATH which java - echo java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz - java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $* + #echo java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz + #java -cp $CLASSPATH $D_ARGS -Djava.library.path="$libspath" $* + echo java -cp "$CLASSPATH" $D_ARGS $clazz + java -cp "$CLASSPATH" $D_ARGS $* #echo java -cp $CLASSPATH $D_ARGS $clazz #java -cp $CLASSPATH $D_ARGS $* echo @@ -96,7 +98,7 @@ function onetest() { #onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG #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.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 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.TestIOUtil01 2>&1 | tee -a $LOG @@ -105,5 +107,5 @@ onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $L #onetest com.jogamp.common.util.TestValueConversion 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 +onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG |