From: Henri Sara <henri.sara@itmill.com>
Date: Mon, 1 Aug 2011 10:26:18 +0000 (+0000)
Subject: #7266 Remove main sampler tests from Vaadin 6.7
X-Git-Tag: 6.7.0.beta1~156
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d03ef9627d966cf2005318c26f3f40b08a5782ae;p=vaadin-framework.git

#7266 Remove main sampler tests from Vaadin 6.7

svn changeset:20055/svn branch:6.7
---

diff --git a/WebContent/VAADIN/readme.txt b/WebContent/VAADIN/readme.txt
index ee64a23423..cabf68b41a 100644
--- a/WebContent/VAADIN/readme.txt
+++ b/WebContent/VAADIN/readme.txt
@@ -28,8 +28,8 @@ Vaadin Development
 ---------------------------
 When developing the Vaadin Library itself, change to "build" directory and
 run "ant widgetsets" to compile all widgetsets or "ant widgetset-default",
-"ant-widgetset-sampler", or "ant widgetset-colorpicker" to compile individual
-widgetsets. You must have GWT installed under build/gwt.
+or "ant widgetset-colorpicker" etc. to compile individual widgetsets. You
+must have GWT installed under build/gwt.
 
 See http://dev.vaadin.com/wiki/DevDocs/StartingDevelopment for instructions for
 installing GWT and compiling widgetsets for Vaadin development.
diff --git a/build/build.xml b/build/build.xml
index de31bb1121..5a0379abbe 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1229,18 +1229,7 @@
     </target>
 
 	<!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task-->
-	<target name="generate-sampler-tests" if="build.include.tests"> 
-        <java classname="com.vaadin.demo.tools.GenerateSamplerTest"
-        	  output="tests/scripts/sampler-all-samples.html">
-            <classpath> 
-                <pathelement path="${result-path}/classes" />
-                <path refid="compile.classpath"/>
-            </classpath>
-        </java>
-    </target>
-    
-	<!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task-->
-    <target name="testbench-tests" depends="generate-sampler-tests" unless="tests.testbench.skip">
+    <target name="testbench-tests" unless="tests.testbench.skip">
         <fail unless="product-file" message="The 'product-file' property must be defined."/>
         <fail unless="version" message="The 'version' property must be defined."/>
 
diff --git a/tests/test.xml b/tests/test.xml
index 7f6331ec8e..4f59fd0311 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -124,7 +124,6 @@
 		<!-- Long tests are prioritized to even out load at the end of the test run -->
 		<!-- If you are interested in certain tests they can temporarily be added here -->
 		<fileset dir="${test-output-dir}" id="priority-tests-fileset">
-			<include name="**/sampler*.java" />
 			<include name="**/reindeer*.java" />
 			<include name="**/runo*.java" />
 			<include name="**/demop*.java" />