diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2013-11-29 11:34:00 +0200 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2013-11-29 11:34:01 +0200 |
| commit | de1c343ea9079f74276484c7d5f1623b5391eaba (patch) | |
| tree | 4088497665be64b9b907ddeb4e30de7e807757c2 /uitest/tb3test.xml | |
| parent | dd7e6fee8c4717df59699f04f7e72a6f2e92008f (diff) | |
| parent | 012e649775e7efbcbbdd9d1c3ef4edd9c9acb71a (diff) | |
| download | vaadin-framework-de1c343ea9079f74276484c7d5f1623b5391eaba.tar.gz vaadin-framework-de1c343ea9079f74276484c7d5f1623b5391eaba.zip | |
Merge changes from origin/7.1
84521fa Use correct type for UIDL value to avoid development mode problems (#12545)
3680505 Ensure generated parser is re-generated during build (#12937)
f3fa6af Regenerated parser files (#12937)
011a2a0 Do not generate ParseException as it has been customized (#12937)
9be3b40 Workaround for missing value change event in chrome (#10109)
48034f6 Ensure alternate text is still visible (#11780)
cbc9949 Added test case for #12726
07b1a9d Prevents accidental selection of window caption or content. (#12726)
e05e10e Added extra asserts to make test more safer to blind refactorings
33e5897 Use localhost when running locally to avoid potential network issues
642818f Allow using @RunLocally to run on a local Firefox/Chrome/Safari
81a1c29 Revert "Fixed lost scrollLeft when row count changed in Table (#12652)."
dde6a48 Output test results in XML reports instead of to standard output
012e649 Fix TB3 local testing and occasionally failing SliderDisableTest.
Change-Id: I4f4e44e887e7e90dd04e6d7381280a997e9527cc
Diffstat (limited to 'uitest/tb3test.xml')
| -rw-r--r-- | uitest/tb3test.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml index dd0c12db91..41cce8f0f2 100644 --- a/uitest/tb3test.xml +++ b/uitest/tb3test.xml @@ -2,6 +2,7 @@ <project name="tb3test" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" basedir="."> <dirname property="tb3test.dir" file="${ant.file.tb3test}" /> + <property name="report.dir" location="${tb3test.dir}/result/reports-tb3" /> <ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" /> <ivy:cachepath pathid="classpath.tb3.lib" conf="build, build-provided" /> @@ -19,13 +20,16 @@ <target name="run-tb3-suite"> <fail unless="junit.test.suite" message="Define suite to run using junit.test.suite" /> <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" /> - <junit printsummary="withOutAndErr" fork="yes"> - <formatter usefile="false" type="plain" /> + <delete dir="${report.dir}" /> + <mkdir dir="${report.dir}" /> + + <junit showoutput="no" printsummary="no" fork="yes"> + <formatter type="xml" /> <classpath refid="classpath.tb3" /> <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" /> <jvmarg value="-Djava.awt.headless=true" /> - <test name="${junit.test.suite}" /> + <test name="${junit.test.suite}" todir="${report.dir}" /> </junit> </target> |