diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 11:56:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 12:29:24 +0200 |
| commit | 741e798633edd584e62bcb4e6a00911a86908cdf (patch) | |
| tree | 22d3b4c625376ba7f79ec82488a64f1696539d5b /uitest/tb3test.xml | |
| parent | 3c84a54591d792b69a4d6d736714941edb1d818a (diff) | |
| parent | 4db0b55aefd83d149e62a7fad2b14fb232d976c8 (diff) | |
| download | vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.tar.gz vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.zip | |
Merge branch 'master' into grid-columnreorder
Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d
Diffstat (limited to 'uitest/tb3test.xml')
| -rw-r--r-- | uitest/tb3test.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml index ecacf43ee2..d3458a412b 100644 --- a/uitest/tb3test.xml +++ b/uitest/tb3test.xml @@ -9,6 +9,8 @@ <property name="categories.exclude" value="" /> <property name="useLocalWebDriver" value="false" /> <property name="com.vaadin.testbench.max.retries" value="0" /> + <property name="com.vaadin.testbench.hub.url" value="" /> + <property name="vaadin.testbench.developer.license" value="" /> <property name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" /> <ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" /> @@ -18,7 +20,8 @@ <path location="${tb3test.dir}/result/classes" /> </path> - <target name="run-all-tb3-tests" unless="tests.tb3.skip" description="Run all the TB3 tests (except server tests) in the project"> + <target name="run-all-tb3-tests" unless="tests.tb3.skip" + description="Run all the TB3 tests (except server tests) in the project"> <antcall target="run-tb3-suite" /> </target> @@ -39,6 +42,8 @@ <jvmarg value="-Dcategories.exclude=${categories.exclude}" /> <jvmarg value="-DuseLocalWebDriver=${useLocalWebDriver}" /> <jvmarg value="-Dcom.vaadin.testbench.max.retries=${com.vaadin.testbench.max.retries}" /> + <jvmarg value="-Dcom.vaadin.testbench.hub.url=${com.vaadin.testbench.hub.url}" /> + <jvmarg value="-Dvaadin.testbench.developer.license=${vaadin.testbench.developer.license}" /> <test name="${junit.test.suite}" todir="${report.dir}" /> </junit> |