Skip to content
Snippets Groups Projects
Commit 3734014d authored by buczekp's avatar buczekp
Browse files

[LMS-1625] improved system tests output

SVN: 16853
parent be86cb21
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,9 @@ ...@@ -67,7 +67,9 @@
<attribute name="failureproperty"/> <attribute name="failureproperty"/>
<sequential> <sequential>
<echo>Running @{testsuite}...</echo> <echo>Running @{testsuite}...</echo>
<junit dir="." fork="true" forkmode="once" maxmemory="1024m" showoutput="true" failureproperty="@{failureproperty}"> <!-- add showoutput="true" when running locally for additional output on console -->
<junit dir="." fork="true" forkmode="once" maxmemory="2048m"
failureproperty="@{failureproperty}" printsummary="on">
<classpath> <classpath>
<pathelement location="${sources}" /> <pathelement location="${sources}" />
<pathelement location="${sources.test}" /> <pathelement location="${sources.test}" />
...@@ -100,29 +102,19 @@ ...@@ -100,29 +102,19 @@
<target name="run-system-tests" depends="prepare-gwt, compile-tests, run-system-tests-no-prep"/> <target name="run-system-tests" depends="prepare-gwt, compile-tests, run-system-tests-no-prep"/>
<target name="run-system-tests-no-prep"> <target name="run-system-tests-no-prep">
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.EditingTestSuite1" <delete dir="${output.test}" />
failureproperty="editing1-failed" /> <mkdir dir="${output.test}" />
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.EditingTestSuite1"
failureproperty="tests.failed" />
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.EditingTestSuite2" <run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.EditingTestSuite2"
failureproperty="editing2-failed" /> failureproperty="tests.failed" />
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite1" <run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite1"
failureproperty="viewing1-failed" /> failureproperty="tests.failed" />
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite2" <run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite2"
failureproperty="viewing2-failed" /> failureproperty="tests.failed" />
<run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite3" <run-system-test-suite testsuite="ch.systemsx.cisd.openbis.generic.ViewingTestSuite3"
failureproperty="viewing3-failed" /> failureproperty="tests.failed" />
<fail> <fail if="tests.failed" message="At least one of system test suites failed. See reports!"/>
<condition>
<or>
<isset property="editing1-failed" />
<isset property="editing2-failed" />
<isset property="viewing1-failed" />
<isset property="viewing2-failed" />
<isset property="viewing3-failed" />
</or>
</condition>
</fail>
<delete dir="${output.test}" />
<mkdir dir="${output.test}" />
</target> </target>
<!-- <!--
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment