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 /make | |
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
Diffstat (limited to 'make')
-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 |
4 files changed, 46 insertions, 7 deletions
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 |