Skip to content

Commit

Permalink
Only run DMG tests when explicitly requested
Browse files Browse the repository at this point in the history
[test-only] RT-38575: Java FX 8u40 build got stuck because hdiutil is hanging when it receives a message "will sleep received"
Reviewed-By: kcr
  • Loading branch information
Danno Ferrin committed Sep 10, 2014
1 parent 083cbdf commit c437693
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,11 @@ ext.IS_COMPILE_JFR = Boolean.parseBoolean(COMPILE_JFR)
defineProperty("RETAIN_PACKAGER_TESTS", "false")
ext.IS_RETAIN_PACKAGER_TESTS = Boolean.parseBoolean(RETAIN_PACKAGER_TESTS)

// TEST_PACKAGER_DMG whether tests that create DMG files via hdiutil
// should be run. On OSX 10.7 this tends to hang automated builds
defineProperty("TEST_PACKAGER_DMG", "false")
ext.IS_TEST_PACKAGER_DMG = Boolean.parseBoolean(TEST_PACKAGER_DMG)

// Define the SWT.jar that we are going to have to download during the build process based
// on what platform we are compiling from (not based on our target).
ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.macosx.x86_64_3.7.2.v3740f" :
Expand Down Expand Up @@ -2043,6 +2048,7 @@ project(":fxpackager") {
test {
dependsOn packagerFXPackagedJar
systemProperty "RETAIN_PACKAGER_TESTS", RETAIN_PACKAGER_TESTS
systemProperty "TEST_PACKAGER_DMG", TEST_PACKAGER_DMG
systemProperty "FULL_TEST", FULL_TEST
}
}
Expand Down
6 changes: 6 additions & 0 deletions gradle.properties.template
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@

#RETAIN_PACKAGER_TESTS = false

# Specifies whether or not Packager DMG tests should be run.
# Mac OSX 10.7 tends to hang on automated builds with hdiutil is run,
# hence the default is false.

#TEST_PACKAGER_DMG = 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public class MacDmgBundlerTest {
public static void prepareApp() {
// only run on mac
Assume.assumeTrue(System.getProperty("os.name").toLowerCase().contains("os x"));

// only run if explicitly requested
Assume.assumeTrue(Boolean.parseBoolean(System.getProperty("TEST_PACKAGER_DMG")));

runtimeJdk = System.getenv("PACKAGER_JDK_ROOT");

Expand Down

0 comments on commit c437693

Please sign in to comment.