#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 ee64a234232310d0f91a7da94ca1a9386a5ca493..cabf68b41a350e199e69bff82a097beb09151cc5 100644 (file)
--- 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 de31bb11218929fb4a36cf40216bd56ce2002370..5a0379abbe4c5d80d4c160423a47394d5adaf81e 100644 (file)
--- 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 7f6331ec8e96df9181d36ff113a1de95caab8136..4f59fd031124597a3db26afefce1677bbaab8201 100644 (file)
--- 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" />