diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-01 10:26:18 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-01 10:26:18 +0000 |
| commit | d03ef9627d966cf2005318c26f3f40b08a5782ae (patch) | |
| tree | 58e2d7f86bb6b3b471e561516145d30f2cda3930 | |
| parent | 1a0b835459b8e28821e6310d4d5aada75a55a278 (diff) | |
| download | vaadin-framework-d03ef9627d966cf2005318c26f3f40b08a5782ae.tar.gz vaadin-framework-d03ef9627d966cf2005318c26f3f40b08a5782ae.zip | |
#7266 Remove main sampler tests from Vaadin 6.7
svn changeset:20055/svn branch:6.7
| -rw-r--r-- | WebContent/VAADIN/readme.txt | 4 | ||||
| -rw-r--r-- | build/build.xml | 13 | ||||
| -rw-r--r-- | tests/test.xml | 1 |
3 files changed, 3 insertions, 15 deletions
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" /> |