Skip to content

Commit

Permalink
MONDRIAN: Fixes an issue with the CI server. JUnit tests launched fro…
Browse files Browse the repository at this point in the history
…m Ant were reported as "FAIL" because of a conditional within the build script which kills the build. Let CI report an UNSTABLE build instead.

[git-p4: depot-paths = "//open/mondrian/": change = 14722]
  • Loading branch information
lucboudreau committed Oct 25, 2011
1 parent 0a9518e commit 44a78ac
Showing 1 changed file with 3 additions and 33 deletions.
36 changes: 3 additions & 33 deletions build.xml
Expand Up @@ -730,7 +730,7 @@ in {mondrian.foodmart.jdbcURL}."

<target name="junit-main" depends="compile,compile.tests,set.connectString" unless="tests.skip">
<mkdir dir="junit-results"/>
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no" errorproperty="juniterror" failureproperty="junitfailure">
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no">
<classpath>
<path refid="project.test.classpath"/>
</classpath>
Expand Down Expand Up @@ -770,21 +770,11 @@ in {mondrian.foodmart.jdbcURL}."
</fileset>
<report format="frames" todir="junit-results/html"/>
</junitreport>
<fail>
<condition>
<isset property="juniterror"/>
</condition>
</fail>
<fail>
<condition>
<isset property="junitfailure"/>
</condition>
</fail>

</target>

<target name="junit-cachehit" depends="compile,compile.tests,set.connectString" unless="tests.skip">
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no" errorproperty="juniterror" failureproperty="junitfailure" showoutput="yes">
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no" showoutput="yes">
<classpath>
<path refid="project.test.classpath"/>
</classpath>
Expand All @@ -803,20 +793,10 @@ in {mondrian.foodmart.jdbcURL}."
</fileset>
</batchtest>
</junit>
<fail>
<condition>
<isset property="juniterror"/>
</condition>
</fail>
<fail>
<condition>
<isset property="junitfailure"/>
</condition>
</fail>
</target>

<target name="junit-cvconcurrent" depends="compile,compile.tests,set.connectString" unless="tests.skip">
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no" errorproperty="juniterror" failureproperty="junitfailure" showoutput="yes">
<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no" showoutput="yes">
<classpath>
<path refid="project.test.classpath"/>
</classpath>
Expand All @@ -835,16 +815,6 @@ in {mondrian.foodmart.jdbcURL}."
</fileset>
</batchtest>
</junit>
<fail>
<condition>
<isset property="juniterror"/>
</condition>
</fail>
<fail>
<condition>
<isset property="junitfailure"/>
</condition>
</fail>
</target>

<macrodef name="genJUnit">
Expand Down

0 comments on commit 44a78ac

Please sign in to comment.