diff options
| author | Sven Gothel <[email protected]> | 2013-02-09 06:17:45 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-09 06:17:45 +0100 |
| commit | 30841742e735e70b3946d16711089960084e894c (patch) | |
| tree | a5ddb9911e6f6bc2e1169f9f7041c6819154e028 /make/scripts | |
| parent | a47d19d59cc8772dcf1ef67083c4401d913ad8d2 (diff) | |
Bug 681: Add Elf Parsing for other OS than Linux, if ARM and !ANDROID using /proc/self/exe (Linux) or a found java/jvm native lib.
- PlatformPropsImpl.queryABITypeImpl: Check Elf Header for ARM + !ANDROID (i.e. add other OS than Linux, use native java/jmv lib)
- NativeLibrary.enumerateLibraryPaths: Add 'sun.boot.library.path' to enumeration!
- TestElfReader01: Add test for finding java/jvm native lib and parse it
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/runtest-x32.bat | 3 | ||||
| -rwxr-xr-x | make/scripts/runtest-x64.bat | 3 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat index b09ce73..a2238df 100755 --- a/make/scripts/runtest-x32.bat +++ b/make/scripts/runtest-x32.bat @@ -1,4 +1,5 @@ REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo -scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +scripts\java-win32.bat com.jogamp.common.os.TestElfReader01 diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat index f437ef7..2e7f1d0 100755 --- a/make/scripts/runtest-x64.bat +++ b/make/scripts/runtest-x64.bat @@ -1,4 +1,5 @@ REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo -scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +scripts\java-win64.bat com.jogamp.common.os.TestElfReader01 diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 9f9a769..3eaec4b 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -41,7 +41,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true" #D_ARGS="-Djogamp.debug.TraceLock" -D_ARGS="-Djogamp.debug.Platform" +D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary" #D_ARGS="-Djogamp.debug.JarUtil" #D_ARGS="-Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.TempFileCache" @@ -68,10 +68,12 @@ function onetest() { 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 $clazz + #java -cp $CLASSPATH $D_ARGS $* echo } # -onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG |