harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r525919 - in /harmony/enhanced/drlvm/trunk/build/make: excludes/exclude.drlvm_smoke.windows.x86_64.jet targets/smoke.test.xml
Date Thu, 05 Apr 2007 17:59:36 GMT
Author: gshimansky
Date: Thu Apr  5 10:59:34 2007
New Revision: 525919

URL: http://svn.apache.org/viewvc?view=rev&rev=525919
Log:
Applied HARMONY-3546 [drlvm][build] smoke tests run does not check exit code


Modified:
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86_64.jet
    harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86_64.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86_64.jet?view=diff&rev=525919&r1=525918&r2=525919
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86_64.jet
(original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86_64.jet
Thu Apr  5 10:59:34 2007
@@ -3,6 +3,7 @@
 
 # HARMONY-2972
 StackTest.java
+stress/Stack.java
 
 # HARMONY-2977
 io/Integers.java

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=525919&r1=525918&r2=525919
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Thu Apr  5 10:59:34 2007
@@ -237,7 +237,14 @@
 
                         <echo message="Running test : ${class.name}" />
 
-                        <java newenvironment="yes" dir="${build.deploy.dir}/jdk/jre/bin"
output="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.out" classname="${class.name}"
fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.out.err">
+                        <java newenvironment="yes"
+                            dir="${build.deploy.dir}/jdk/jre/bin"
+                            output="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.out"
+                            classname="${class.name}"
+                            fork="true"
+                            jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}"
+                            error="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.out.err"
+                            resultproperty="res.code">
                             <jvmarg line="-XX:-vm.assert_dialog ${mode.switch} ${test.vmargs}"
/>
                             <jvmarg value="-Djava.library.path=${smoke.test.native.path}/${outdir}"
/>
                             <jvmarg value="-classpath" />
@@ -286,6 +293,26 @@
                                         <not>
                                             <contains string="${@{test}.out}" substring="FAIL"
casesensitive="false" />
                                         </not>
+
+                                        <!-- the return code must be checked -->
+                                        <or>
+                                            <!-- it must be '0' in general -->
+                                            <equals arg1="${res.code}" arg2="0" />
+
+                                            <!-- some tests passes w/ non-'0' code -->
+                                            <and>
+                                                <equals arg1="${class.name}" arg2="init.ErrorInInitializer"
/>
+                                                <equals arg1="${res.code}" arg2="1" />
+                                            </and>
+                                            <and>
+                                                <equals arg1="${class.name}" arg2="shutdown.TestFatalError"
/>
+                                                <equals arg1="${res.code}" arg2="1" />
+                                            </and>
+                                            <and>
+                                                <equals arg1="${class.name}" arg2="shutdown.TestInterrupt"
/>
+                                                <equals arg1="${res.code}" arg2="130"
/>
+                                            </and>
+                                        </or>
                                     </and>
                                 </condition>
                             </else>
@@ -306,7 +333,7 @@
                                 <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.id}.xml"
token="@@@@@" value="${class.name}_${mode.id}" /> 
                             </then>
                             <else>
-                                <echo message="*** FAILED **** : ${class.name}" />
+                                <echo message="*** FAILED **** : ${class.name} (${res.code}
res code)" />
                                 <echo message="*** FAILED **** : ${class.name} on ${mode.name}${line.separator}"
file="${build.semi.dir}/smoke.test.failed" append="true"/>
 
                                 <!-- create xml-file with test's results -->
@@ -320,6 +347,9 @@
                                 <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.id}.xml"
token="@@@@@" value="${class.name}_${mode.id}" /> 
                             </else>
                         </if>
+
+                        <!-- unset res.code variable to use it for next run-->
+                        <var name="res.code" unset="true"/>
 
                         <!-- grab System.out to xml-file -->
                         <loadfile property="@{test}.tmp.out" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.out"
/>



Mime
View raw message