diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-04 18:10:05 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2013-11-18 12:40:30 +0000 |
| commit | dde6a4893dd1c3d1bc040d58db6fd4cec012c74c (patch) | |
| tree | 3910b3b0d5f57e690dfd7d36a192af2d74303606 /uitest/test.xml | |
| parent | 81a1c293f0e407db4a5443b85e57d32cddd397a7 (diff) | |
| download | vaadin-framework-dde6a4893dd1c3d1bc040d58db6fd4cec012c74c.tar.gz vaadin-framework-dde6a4893dd1c3d1bc040d58db6fd4cec012c74c.zip | |
Output test results in XML reports instead of to standard output
This is a workaround for a problem with the integrated TeamCity JUnit
listener which is not thread safe. Without this the test results are
completely mixed up in TeamCity. For more information, see
http://youtrack.jetbrains.com/issue/TW-33176.
All standard JUnit test reports is put in result/reports. For uitest
there are three report directories: result/reports-tb2,
result/reports-tb3 and result/reports-integration to be able to clean
the directories before running a given type of tests.
This change is based on the separate fixes by John.
Change-Id: I2f0dee416f6745544636f2f3dcea0d0832ff8076
Diffstat (limited to 'uitest/test.xml')
| -rw-r--r-- | uitest/test.xml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/uitest/test.xml b/uitest/test.xml index b0db8d47f4..57f61d67fa 100644 --- a/uitest/test.xml +++ b/uitest/test.xml @@ -3,7 +3,6 @@ <include file="../common.xml" /> <dirname property="test.xml.dir" file="${ant.file.Run Vaadin Testbench Tests}" /> - <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> @@ -84,6 +83,11 @@ </target> <target name="run-tb2-tests" depends="check-parameters,compile-tests"> + <property name="report.qualifier" value="tb2" /> + <property name="report.dir" location="${test.xml.dir}/result/reports-${report.qualifier}" /> + + <delete dir="${report.dir}" /> + <mkdir dir="${report.dir}" /> <fileset dir="${test-output-dir}" id="tests-fileset"> <include name="**/**.java" /> </fileset> @@ -103,13 +107,16 @@ <!-- This target runs the generated and compiled junit tests --> <target name="execute-tests"> - <junit fork="yes" printsummary="withOutAndErr" maxmemory="96m"> + <!-- Junit does not create the report dir so we need to ensure it + exists --> + <mkdir dir="${report.dir}" /> + <junit fork="yes" showoutput="no" printsummary="no" maxmemory="96m"> <classpath> <path refid="classpath" /> <pathelement path="${class-dir}" /> </classpath> - <formatter usefile="false" type="plain" /> + <formatter type="xml" /> <jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" /> <jvmarg value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" /> @@ -129,7 +136,7 @@ <jvmarg value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" /> <jvmarg value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" /> - <batchtest> + <batchtest todir="${report.dir}"> <filelist dir="${test-output-dir}" files="${target}" /> </batchtest> </junit> |