diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 23 | ||||
| -rwxr-xr-x | make/scripts/check-junit.sh | 53 |
2 files changed, 44 insertions, 32 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 53fe3f610..7d5582b03 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -42,8 +42,6 @@ <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build.test}" /> - <fileset dir="${build}/test/results-x32"/> - <fileset dir="${build}/test/results-x64"/> <fileset dir="." includes="*.tga" /> <fileset file="${jogl.test.jar}" /> </delete> @@ -58,14 +56,6 @@ <mkdir dir="${obj.test}" /> <mkdir dir="${classes}" /> - <!-- Clean the results --> - <delete quiet="true"> - <fileset dir="${results.test}" includes="**"/> - <fileset file="${build}/${test.archive.name}.7z"/> - <fileset dir="." includes="*.tga" /> - </delete> - <mkdir dir="${results.test}" /> - <property name="jogl.test.jar.path" location="${jogl.test.jar}"/> <!-- absolute path --> <echo message="jogl.test.jar ${jogl.test.jar.path}"/> <uptodate property="test.compile.skip"> @@ -498,12 +488,23 @@ <move todir="${build}/test/results-x32"> <fileset dir="${results.test}" includes="**" /> </move> + <mkdir dir="${build}/test/results"/> <var name="jvmDataModel.arg" unset="true"/> <var name="jvmDataModel.arg" value="-d64"/> </target> - <target name="junit.run" depends="declare.common, junit.run.d32, junit.run.tests"> + <target name="junit.run.settings"> + <delete quiet="true"> + <fileset dir="${results.test}" includes="**"/> + <fileset dir="${build}/test/results-x32" includes="**"/> + <fileset file="${build}/${test.archive.name}.7z"/> + <fileset dir="." includes="*.tga" /> + </delete> + <mkdir dir="${results.test}" /> + </target> + + <target name="junit.run" depends="declare.common, junit.run.settings, junit.run.d32, junit.run.tests"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> <fileset dir="." includes="*.tga" /> diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh index 1b1ba7875..474d074a6 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 |