summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-02-26 11:07:42 +0200
committerArtur Signell <artur@vaadin.com>2013-03-01 15:54:57 +0200
commite6d506494c8ead64e72db63d951be9a79f6bb482 (patch)
tree87ca3e4c85948040580256363559d5039457512c /uitest
parentc965ff2475f4047ae5efa2b2917089f8b97e95d9 (diff)
downloadvaadin-framework-e6d506494c8ead64e72db63d951be9a79f6bb482.tar.gz
vaadin-framework-e6d506494c8ead64e72db63d951be9a79f6bb482.zip
Renamed "tests" target to "test" and added "test-all" (#9998)
The "test" target runs all tests which do not require additional servers or setup. Can be run immediately after cloning the project. The "test-all" target runs also integration tests and UI tests which require access to servers or additional setup. Change-Id: I2f5371dc5be805ba12766c8187a2b58fbc7f7db4
Diffstat (limited to 'uitest')
-rw-r--r--uitest/build.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/uitest/build.xml b/uitest/build.xml
index 53da0ae2e9..453fc26ea5 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -16,7 +16,7 @@
</path>
<target name="dependencies">
- <!-- This is copied from common.xml to be able to add server.tests.source to the source path -->
+ <!-- This is copied from common.xml to be able to add server.test.source to the source path -->
<ivy:resolve resolveid="common" conf="build, build-provided" />
<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
@@ -28,12 +28,12 @@
<property name="result.dir" location="result" />
<property name="src" location="${result.dir}/../src" />
<property name="classes" location="${result.dir}/classes" />
- <property name="server.tests.sources" location="${result.dir}/../../server/tests/src" />
+ <property name="server.test.sources" location="${result.dir}/../../server/tests/src" />
<mkdir dir="${classes}" />
<!-- TODO: Get rid of this -->
<javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
- <src path="${server.tests.sources}" />
+ <src path="${server.test.sources}" />
<include name="com/vaadin/tests/data/bean/**" />
<include name="com/vaadin/tests/VaadinClasses.java" />
<include name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
@@ -140,8 +140,8 @@
<target name="checkstyle">
<echo>Checkstyle is disabled for uitest for now</echo>
</target>
- <target name="tests" depends="checkstyle">
- <!--<antcall target="common.tests.run" />-->
+ <target name="test" depends="checkstyle">
+ <!--<antcall target="common.test.run" />-->
<echo>WHAT? No JUnit tests for ${module.name}!</echo>
</target>