changeset 1091:45a06f0a889f

[TEST-ONLY] RT-21078: Run long-running tests only as part of "ant full-test"
author kcr
date Thu, 17 May 2012 17:03:15 -0700
parents 3440e9a39f0a
children afd6ff987c7f
files build-defs.xml javafx-concurrent/project.properties
diffstat 2 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/build-defs.xml	Thu May 17 16:15:50 2012 -0700
+++ b/build-defs.xml	Thu May 17 17:03:15 2012 -0700
@@ -89,8 +89,20 @@
         <clean-project/>
     </target>
 
-    <target name="test" depends="jar">
-        <test-project/>
+    <target name="-check-smoke-test-excludes" unless="is-full-test">
+        <property name="test.excludes" value="${smoke.test.excludes}"/>
+    </target>
+
+    <target name="-init-test" depends="-check-smoke-test-excludes">
+    </target>
+
+    <target name="full-test">
+        <property name="is-full-test" value="true"/>
+        <antcall target="test"/>
+    </target>
+
+    <target name="test" depends="-init-test,jar">
+        <test-project excludes="${test.excludes}"/>
     </target>
 
     <target name="test-single" depends="jar">
@@ -195,6 +207,7 @@
 
     <macrodef name="test-project">
         <attribute name="testsrc" default="${test.dir}"/>
+        <attribute name="excludes" default=""/>
         <sequential>
             <!-- compile all test sources -->
             <build-tests testsrc="@{testsrc}"/>
--- a/javafx-concurrent/project.properties	Thu May 17 16:15:50 2012 -0700
+++ b/javafx-concurrent/project.properties	Thu May 17 17:03:15 2012 -0700
@@ -18,3 +18,6 @@
     ${runtime.dist.root.dir}/../artifacts/sdk/rt/lib/jfxrt.jar:\
     ${build.test.classes.dir}
 run.jvmargs=-Djavafx.toolkit=com.sun.javafx.pgstub.StubToolkit
+smoke.test.excludes=\
+    javafx/concurrent/ServiceLifecycleTest.class \
+    javafx/concurrent/ServiceWithSecurityManagerTest.class