From e6d506494c8ead64e72db63d951be9a79f6bb482 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 26 Feb 2013 11:07:42 +0200
Subject: 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
---
 theme-compiler/build.xml |  6 +++---
 theme-compiler/ivy.xml   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'theme-compiler')

diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index cd441dee70..277929d160 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -15,7 +15,7 @@
 	<property name="sass.parser.jj" location="src/com/vaadin/sass/internal/parser/Parser.jj" />
 	<path id="classpath.compile.custom">
 	</path>
-	<path id="classpath.tests.custom" />
+	<path id="classpath.test.custom" />
 
 	<!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**" />-->
 
@@ -51,8 +51,8 @@
 		</antcall>
 	</target>
 
-	<target name="tests" depends="checkstyle">
-		<antcall target="common.tests.run" />
+	<target name="test" depends="checkstyle">
+		<antcall target="common.test.run" />
 	</target>
 
 </project>
\ No newline at end of file
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index b1a98b7101..f0646c04e6 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -11,7 +11,7 @@
         <conf name="build" />
         <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="tests" />
+        <conf name="test" />
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
@@ -23,17 +23,17 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,tests" />
+            rev="${vaadin.version}" conf="build,test->build" />
 
         <!-- Required build libs -->
         <dependency org="org.apache.commons" name="commons-jexl"
-            rev="2.1.1" conf="build,ide,tests->default" />
+            rev="2.1.1" conf="build,ide,test->default" />
         <dependency org="org.w3c.css" name="sac" rev="1.3"
-            conf="build,ide,tests->default" />
+            conf="build,ide,test->default" />
         <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.5" conf="build,ide,tests->default" />
+            rev="0.9.5" conf="build,ide,test->default" />
         <dependency org="commons-cli" name="commons-cli" rev="1.2"
-            conf="build,ide,tests->default" />
+            conf="build,ide,test->default" />
 
         <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"
@@ -41,7 +41,7 @@
 
         <!-- Testing libs -->
         <dependency org="junit" name="junit" rev="4.5"
-            conf="tests -> default" />
+            conf="test -> default" />
 
         <!-- Internally used, for now -->
         <dependency org="com.carrotsearch" name="smartsprites"
-- 
cgit v1.2.3