diff options
author | Sven Gothel <[email protected]> | 2011-07-21 11:49:08 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-07-21 11:49:08 +0200 |
commit | 4aa66890176e9c2d8e648d6031c9491c3d625e07 (patch) | |
tree | 68256127a3e68313b127786a8c49eaefa9e7056e | |
parent | dc4b259b6651bdc0cec0895bc74e26e504870c8e (diff) |
Fix TestStructAccessorEndian
- StructAccessor uses byteOffset now (since 8b3057585930357bb16546f584d998953b084034)
Fix linux armv7l eabi:
- build.xml arm7 -> armv7
- all tests passes
Adding NativeSizeAlignment-linux-armv7l_eabi from passing test
OK: linux 32/64/armv7l, windows 32/64
-rw-r--r-- | doc/Implementation/native-size/NativeSizeAlignment-linux-armv7l_eabi.log | 101 | ||||
-rw-r--r-- | make/build.xml | 10 | ||||
-rwxr-xr-x | make/scripts/check-junit.sh | 27 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv7l_eabi.sh | 12 | ||||
-rwxr-xr-x | make/scripts/runtest.sh | 4 | ||||
-rw-r--r-- | src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java | 13 |
6 files changed, 157 insertions, 10 deletions
diff --git a/doc/Implementation/native-size/NativeSizeAlignment-linux-armv7l_eabi.log b/doc/Implementation/native-size/NativeSizeAlignment-linux-armv7l_eabi.log new file mode 100644 index 0000000..627f6fa --- /dev/null +++ b/doc/Implementation/native-size/NativeSizeAlignment-linux-armv7l_eabi.log @@ -0,0 +1,101 @@ +LD_LIBRARY_PATH=../build-armv7l_eabi/obj:../build-armv7l_eabi/test/build/natives:: java -Djogamp.debug.TraceLock -Djava.library.path=../build-armv7l_eabi/obj:../build-armv7l_eabi/test/build/natives: -classpath lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:/usr/share/ant/lib/ant-launcher.jar:../build-armv7l_eabi/gluegen-rt.jar:../build-armv7l_eabi/gluegen.jar:../build-armv7l_eabi/test/build/classes com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter +JUnit version 4.8.2 +.......static md: MachineDescriptionStatic: ARMle_EABI(0): MachineDescription: runtimeValidated false, littleEndian true, 32Bit true, primitive size / alignment: + int8 1 / 1, int16 2 / 2 + int 4 / 4, long 4 / 4 + int32 4 / 4, int64 8 / 8 + float 4 / 4, double 8 / 8, ldouble 8 / 8 + pointer 4 / 4, page 4096 +runtime md: MachineDescription: runtimeValidated true, littleEndian true, 32Bit true, primitive size / alignment: + int8 1 / 1, int16 2 / 2 + int 4 / 4, long 4 / 4 + int32 4 / 4, int64 8 / 8 + float 4 / 4, double 8 / 8, ldouble 8 / 8 + pointer 4 / 4, page 4096 +compatible static/runtime: true +TK_ComplicatedSubSet: sizeof(): 64 +TK_ComplicatedSubSet: bits1-s offset: 0 +TK_ComplicatedSubSet: id-s offset: 4 +TK_ComplicatedSubSet: bits2-s offset: 8 +TK_ComplicatedSubSet: long0-s offset: 16 +TK_ComplicatedSubSet: bits3-s offset: 24 +TK_ComplicatedSubSet: real0-s offset: 32 +TK_ComplicatedSubSet: bits4-s offset: 40 +TK_ComplicatedSubSet: real1-s offset: 44 +TK_ComplicatedSubSet: bits5-s offset: 48 +TK_ComplicatedSubSet: longX-s offset: 52 +TK_ComplicatedSubSet: bits6-s offset: 56 +TK_ComplicatedSuperSet: sizeof(): 152 +TK_ComplicatedSuperSet: bits1-s offset: 0 +TK_ComplicatedSuperSet: sub1-s offset: 8 +TK_ComplicatedSuperSet: bits2-s offset: 72 +TK_ComplicatedSuperSet: sub2-s offset: 80 +TK_ComplicatedSuperSet: bits3-s offset: 144 +createComplicatedSuperSet: +TK_ComplicatedSuperSet [ + cs.b1 0xA0 + cs.sub1.b1 0xA1 + cs.sub1.id 0x12345678 + cs.sub1.b2 0xA2 + cs.sub1.long0 0x9ABCDEF0 + cs.sub1.b3 0xA3 + cs.sub1.real0 3.14159 0X1.921FB54442D18P+1 + cs.sub1.b4 0xA4 + cs.sub1.real1 256.123 0X1.001F9AP+8 + cs.sub1.b5 0xA5 + cs.sub1.longX 0xDEADBEEF + cs.sub1.b6 0xA6 + cs.b2 0xB0 + cs.sub2.b1 0xB1 + cs.sub2.id 0x12345678 + cs.sub2.b2 0xB2 + cs.sub2.long0 0x9ABCDEF0 + cs.sub2.b3 0xB3 + cs.sub2.real0 3.14159 0X1.921FB54442D18P+1 + cs.sub2.b4 0xB4 + cs.sub2.real1 256.123 0X1.001F9AP+8 + cs.sub2.b5 0xB5 + cs.sub2.longX 0xDEADBEEF + cs.sub2.b6 0xB6 + cs.b3 0xC0 +] + +hasInitValues res 1: +TK_ComplicatedSuperSet [ + cs.b1 0xA0 + cs.sub1.b1 0xA1 + cs.sub1.id 0x12345678 + cs.sub1.b2 0xA2 + cs.sub1.long0 0x9ABCDEF0 + cs.sub1.b3 0xA3 + cs.sub1.real0 3.14159 0X1.921FB54442D18P+1 + cs.sub1.b4 0xA4 + cs.sub1.real1 256.123 0X1.001F9AP+8 + cs.sub1.b5 0xA5 + cs.sub1.longX 0xDEADBEEF + cs.sub1.b6 0xA6 + cs.b2 0xB0 + cs.sub2.b1 0xB1 + cs.sub2.id 0x12345678 + cs.sub2.b2 0xB2 + cs.sub2.long0 0x9ABCDEF0 + cs.sub2.b3 0xB3 + cs.sub2.real0 3.14159 0X1.921FB54442D18P+1 + cs.sub2.b4 0xB4 + cs.sub2.real1 256.123 0X1.001F9AP+8 + cs.sub2.b5 0xB5 + cs.sub2.longX 0xDEADBEEF + cs.sub2.b6 0xB6 + cs.b3 0xC0 +] + +0x123456789abcdef0 == 0x9abcdef09abcdef0 +0x9abcdef0 == 0x9abcdef0 +0x123456789abcdef0 == 0x401333c99abcdef0 +0x9abcdef0 == 0x9abcdef0 + +Time: 0.419 + +OK (7 tests) + + diff --git a/make/build.xml b/make/build.xml index d27b801..870c537 100644 --- a/make/build.xml +++ b/make/build.xml @@ -291,13 +291,13 @@ <property name="linker.cfg.id" value="linker.cfg.linux" /> </target> - <target name="declare.linux.arm7" if="isLinuxARM7"> - <echo message="Linux.arm7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.arm7" /> - <property name="linker.cfg.id" value="linker.cfg.linux.arm7" /> + <target name="declare.linux.armv7" if="isLinuxARMv7"> + <echo message="Linux.armv7" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7" /> + <property name="linker.cfg.id" value="linker.cfg.linux.armv7" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.arm7" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.armv7" if="isLinux" > <property name="c.src.dir.os" value="unix" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh new file mode 100755 index 0000000..1b1ba78 --- /dev/null +++ b/make/scripts/check-junit.sh @@ -0,0 +1,27 @@ +#! /bin/bash + +builddir=$1 +shift + +echo number of junit classes +grep failures $builddir/test/results/* | wc +echo +echo number of passed junit classes - failures +grep failures $builddir/test/results/* | grep "failures=\"0\"" | wc +echo +echo number of passed junit classes - errors +grep failures $builddir/test/results/* | grep "errors=\"0\"" | wc +echo +echo number of failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" | wc +echo +echo number of failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" | wc +echo +echo failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" +echo +echo failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" +echo + diff --git a/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh b/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh new file mode 100755 index 0000000..9d1975c --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxX86=true \ +# -DisX11=true \ + +ant \ + -Drootrel.build=build-armv7l_eabi \ + $* 2>&1 | tee make.gluegen.all.linux-armv7l_eabi.log diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 6468d61..33f5510 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -50,7 +50,7 @@ function onetest() { #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.TestPointerBufferEndian 2>&1 | tee -a $LOG -#onetest com.jogamp.gluegen.test.TestStructAccessorEndian 2>&1 | tee -a $LOG -onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG +onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG diff --git a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java index 8a20272..4a9173e 100644 --- a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java +++ b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java @@ -1,8 +1,9 @@ package com.jogamp.common.nio; -import com.jogamp.common.nio.*; import com.jogamp.common.os.*; +import com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter; +import java.io.IOException; import java.nio.*; import org.junit.Assert; @@ -28,13 +29,19 @@ public class TestStructAccessorEndian { int i; for(i=0; i<valuesSource.length; i++) { - acc.setLongAt(i, valuesSource[i]); + acc.setLongAt(i*8, valuesSource[i]); } for(i=0; i<valuesSource.length; i++) { - long v = acc.getLongAt(i); + long v = acc.getLongAt(i*8); long t = valuesSource[i]; Assert.assertTrue("Value["+i+"] shall be 0x"+Long.toHexString(t)+", is: 0x"+Long.toHexString(v), t == v); } } + + public static void main(String args[]) throws IOException { + String tstname = TestStructAccessorEndian.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } + } |