changeset 5629:92bc2b511939

RT-34054: Need option to disable system tests that use AWT Reviewed-by: mtvo
author kcr
date Mon, 04 Nov 2013 18:06:21 -0800
parents ed14640dd11c
children a62e639df566
files build.gradle gradle.properties.template
diffstat 2 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Mon Nov 04 20:57:08 2013 -0500
+++ b/build.gradle	Mon Nov 04 18:06:21 2013 -0800
@@ -338,6 +338,10 @@
 defineProperty("USE_ROBOT", "true")
 ext.IS_USE_ROBOT = Boolean.parseBoolean(USE_ROBOT);
 
+// Specifies whether to run system tests that depend on AWT (only used when FULL_TEST is also enabled)
+defineProperty("AWT_TEST", "true")
+ext.IS_AWT_TEST = Boolean.parseBoolean(AWT_TEST);
+
 // Specify the build configuration (Release, Debug, or DebugNative)
 defineProperty("CONF", "Debug")
 ext.IS_DEBUG_JAVA = CONF == "Debug" || CONF == "DebugNative"
@@ -1450,6 +1454,11 @@
             exclude("**/javafx/scene/layout/*.*");
             exclude("**/test3d/*.*");
         }
+        if (!IS_AWT_TEST) {
+            // Disable all AWT-based tests
+            exclude("**/javafx/embed/swing/*.*");
+            exclude("**/com/sun/javafx/application/Swing*.*");
+        }
         forkEvery = 1
         classpath = files("$sdkDir/rt/lib/ext/jfxrt.jar") + classpath
     }
--- a/gradle.properties.template	Mon Nov 04 20:57:08 2013 -0500
+++ b/gradle.properties.template	Mon Nov 04 18:06:21 2013 -0800
@@ -63,6 +63,11 @@
 
 #USE_ROBOT = false
 
+# Specifies whether to run system tests that depend on AWT.
+# This flag is ignored if FULL_TEST is false.
+
+#AWT_TEST = false
+
 # Specify the COMPILE_TARGETS when performing cross compiles. A Cross-Compile is
 # when you build for a platform other than the one you are building on. For example,
 # to build for Apple iOS, you would specify ios as one of the COMPILE_TARGETS.