# HG changeset patch # User ddhill # Date 1452864475 18000 # Fri Jan 15 08:27:55 2016 -0500 # Node ID a45f8cfea61adf2bd3aafc5eaaacc1cdba45dc73 # Parent ba7677485c4adfd3baf93291bd3f76655447bba0 8147454: move systemsTest block later in build.gradle Reviewed-by: kcr diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -1783,34 +1783,6 @@ } } -// This project is for system tests that need to run with a full SDK. -// Most of them display a stage or do other things that preclude running -// them in a shared JVM or as part of the "smoke test" run (which must -// not pop up any windows or use audio). As such, they are only enabled -// when FULL_TEST is specified, and each test runs in its own JVM -project(":systemTests") { - - dependencies { - testCompile project(":graphics").sourceSets.test.output - testCompile project(":base").sourceSets.test.output - } - - test { - enabled = IS_FULL_TEST - if (!IS_USE_ROBOT) { - // Disable all robot-based visual tests - exclude("test/robot/**"); - } - if (!IS_AWT_TEST) { - // Disable all AWT-based tests - exclude("**/javafx/embed/swing/*.*"); - exclude("**/com/sun/javafx/application/Swing*.*"); - } - - forkEvery = 1 - } -} - project(":fxpackager") { tasks.all { if (!COMPILE_FXPACKAGER) it.enabled = false @@ -2721,6 +2693,34 @@ } } +// This project is for system tests that need to run with a full SDK. +// Most of them display a stage or do other things that preclude running +// them in a shared JVM or as part of the "smoke test" run (which must +// not pop up any windows or use audio). As such, they are only enabled +// when FULL_TEST is specified, and each test runs in its own JVM +project(":systemTests") { + + dependencies { + testCompile project(":graphics").sourceSets.test.output + testCompile project(":base").sourceSets.test.output + } + + test { + enabled = IS_FULL_TEST + if (!IS_USE_ROBOT) { + // Disable all robot-based visual tests + exclude("test/robot/**"); + } + if (!IS_AWT_TEST) { + // Disable all AWT-based tests + exclude("**/javafx/embed/swing/*.*"); + exclude("**/com/sun/javafx/application/Swing*.*"); + } + + forkEvery = 1 + } +} + allprojects { // The following block is a workaround for the fact that presently Gradle // can't set the -XDignore.symbol.file flag, because it appears that the