diff options
| author | Sven Gothel <[email protected]> | 2023-11-28 03:56:33 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-11-28 03:56:33 +0100 |
| commit | c8cb87e17a14281a9d0e2f311b8534ecb7ac00b4 (patch) | |
| tree | dcbce53804b54a224061e24a3217e600f04fc493 /make | |
| parent | c7efca6d9b0db7305f5352ebf15d915ae5a1fa24 (diff) | |
Bug 1474: Allow temp folder for exe-file test to contain parenthesis on Windows
If the temp path contains parenthesis on Windows, e.g. the username or the sub-temp folder,
the used exeTestFile.getCanonicalPath() can't be used by 'Runtime.getRuntime().exec( path )'.
Example: C:\Users\(ABC)abc\AppData\Local\Temp
Output: Exe-Tst: 'C:\Users\' is not recognized as an internal or external command, operable program or batch file.
Hence the complete canonical path must be quoted, i.e.
Path: "C:\Users\(ABC)abc\AppData\Local\Temp"
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/java-win64.bat | 1 | ||||
| -rwxr-xr-x | make/scripts/runtest-x64.bat | 13 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 26a4591..2f79cbd 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -21,6 +21,7 @@ REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" "-Djogam REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.IOUtil.Exe" "-Djogamp.debug.IOUtil.Exe.NoStream"
REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache" "-Djogamp.debug.IOUtil.Exe" "-Djogamp.gluegen.UseNativeExeFile=true" "-Djava.io.tmpdir=c:\temp_noexec"
REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache" "-Djava.io.tmpdir=c:\temp_noexec"
+REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.IOUtil.Exe" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache"
REM set D_ARGS="-Djogamp.debug=all"
%J2RE_HOME%\bin\java -classpath %CP_ALL% %X_ARGS% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1
diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat index 21d7f78..b8bd437 100755 --- a/make/scripts/runtest-x64.bat +++ b/make/scripts/runtest-x64.bat @@ -1,14 +1,15 @@ -REM set TEMP=C:\Documents and Settings\jogamp\temp-exec -REM set TMP=C:\Documents and Settings\jogamp\temp-exec -REM set TEMP=C:\Users\jogamp\temp-exec -REM set TMP=C:\Users\jogamp\temp-exec +REM set TEMP=C:\Documents and Settings\test\temp-exec +REM set TMP=C:\Documents and Settings\test\temp-exec +REM set TEMP=C:\Users\test\temp-exec +REM set TMP=C:\Users\test\temp-exec +REM set TMP=C:\Users\test\(ABC)abc\temp -REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion +scripts\java-win64.bat com.jogamp.common.GlueGenVersion REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win64.bat com.jogamp.gluegen.jcpp.IncludeAbsoluteTest -scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.TestJCPP +REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.TestJCPP REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.TestCParser REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index ab80674..d6d5a45 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -137,7 +137,7 @@ function onetest() { #onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG -#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG +onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestAssetURLConnectionUnregistered 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestAssetURLConnectionRegistered 2>&1 | tee -a $LOG #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG @@ -171,7 +171,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.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG -onetest com.jogamp.gluegen.test.junit.generation.Test1p2DynamicLibraryBundle 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p2DynamicLibraryBundle 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test2p1FuncPtr 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test2p2FuncPtr 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test3p1PtrStorage 2>&1 | tee -a $LOG |