diff options
| -rw-r--r-- | make/build-test.xml | 28 | ||||
| -rwxr-xr-x | make/scripts/check-junit.sh | 53 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 9 |
3 files changed, 61 insertions, 29 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index cbd7ce0..6728cd7 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -367,19 +367,38 @@ ${line.separator} </junit> </target> - <target name="junit.run.settings" depends="init"> + <target name="junit.run.settings"> <!-- Use absolute path --> <property name="gluegen.lib.abs" location="${gluegen.lib}" /> <property name="build_t.lib.abs" location="${build_t.lib}" /> <delete quiet="true"> <fileset dir="${build}/test/results" includes="**"/> + <fileset dir="${build}/test/results-x32" includes="**"/> <fileset file="${build}/${test.archive.name}.7z"/> </delete> <mkdir dir="${build}/test/results"/> </target> - <target name="junit.run" depends="init,gluegen.cpptasks.detect.os,junit.run.settings,junit.run.local,junit.run.remote.ssh,junit.run.remote.adb"> + <target name="junit.run.d32" if="isOSX"> + <var name="jvmDataModel.arg" unset="true"/> + <var name="jvmDataModel.arg" value="-d32"/> + + <antcall target="junit.run.local" inheritRefs="true" inheritAll="true"/> + + <mkdir dir="${build}/test/results-x32"/> + <move todir="${build}/test/results-x32"> + <fileset dir="${build}/test/results" includes="**" /> + </move> + <mkdir dir="${build}/test/results"/> + + <var name="jvmDataModel.arg" unset="true"/> + <var name="jvmDataModel.arg" value="-d64"/> + </target> + + <target name="junit.run.tests" depends="junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> + + <target name="junit.run" depends="init, gluegen.cpptasks.detect.os, junit.run.settings, junit.run.d32, junit.run.tests"> <antcall target="test-zip-archive" inheritRefs="true" /> </target> @@ -529,8 +548,9 @@ ${line.separator} <!-- updates / create the test results zip file --> <target name="test-zip-archive" depends="init"> <archive.7z destfile="${build}/${test.archive.name}.7z" - basedir="${build}/test/results" - includes="**" /> + basedir="${project.root}" + includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" /> </target> + </project> diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh index 1b1ba78..474d074 100755 --- a/make/scripts/check-junit.sh +++ b/make/scripts/check-junit.sh @@ -3,25 +3,36 @@ 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 +function checkresult() { + resdir=$1 + shift + if [ -e $builddir/test/$resdir ] ; then + echo + echo Results of $builddir/test/$resdir + echo + echo number of junit classes + grep failures $builddir/test/$resdir/* | wc + echo + echo number of passed junit classes - failures + grep failures $builddir/test/$resdir/* | grep "failures=\"0\"" | wc + echo + echo number of passed junit classes - errors + grep failures $builddir/test/$resdir/* | grep "errors=\"0\"" | wc + echo + echo number of failed junit classes - failures + grep failures $builddir/test/$resdir/* | grep -v "failures=\"0\"" | wc + echo + echo number of failed junit classes - errors + grep failures $builddir/test/$resdir/* | grep -v "errors=\"0\"" | wc + echo + echo failed junit classes - failures + grep failures $builddir/test/$resdir/* | grep -v "failures=\"0\"" + echo + echo failed junit classes - errors + grep failures $builddir/test/$resdir/* | grep -v "errors=\"0\"" + echo + fi +} +checkresult results +checkresult results-x32 diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 286921a..7968dc0 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -31,7 +31,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.TraceLock" #D_ARGS="-Djogamp.debug.JarUtil" #D_ARGS="-Djogamp.debug.TempFileCache" -#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JARUtil" +#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false" #D_ARGS="-Djogamp.debug.JNILibLoader" #D_ARGS="-Djogamp.debug.Lock" @@ -47,7 +47,8 @@ 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 echo LD_LIBRARY_PATH $LD_LIBRARY_PATH echo CLASSPATH $CLASSPATH - java $D_ARGS -Djava.library.path=$libspath $clazz + echo java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz + java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz echo } @@ -65,9 +66,9 @@ function onetest() { #onetest com.jogamp.common.nio.TestPointerBufferEndian 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.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 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 -#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG +onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG |