Skip to content
Permalink
Browse files
8264140: Add -Djava.security.manager=allow to JavaFX tests calling se…
…tSecurityManager

8234175: Remove obsolete ServiceWithSecurityManagerTest unit test

Reviewed-by: arapte
  • Loading branch information
kevinrushforth committed May 24, 2021
1 parent 2fd5092 commit 9507ea416a14639ed41e4cfdd87df7c12114078c
Showing with 11 additions and 128 deletions.
  1. +11 −0 build.gradle
  2. +0 −128 modules/javafx.graphics/src/test/java/test/javafx/concurrent/ServiceWithSecurityManagerTest.java
@@ -622,6 +622,10 @@ try {
def jdkVersionInfo = parseJavaVersion(ver)
defineProperty("jdkVersion", jdkVersionInfo[0])
defineProperty("jdkBuildNumber", jdkVersionInfo[1])

// Define global properties based on the version of Java
def status = compareJdkVersion(jdkVersion, "12")
ext.jdk12OrLater = (status >= 0)
}
}
} finally {
@@ -3456,6 +3460,9 @@ project(":web") {
dependsOn webArchiveJar
def testResourceDir = file("$buildDir/testing/resources")
jvmArgs "-DWEB_ARCHIVE_JAR_TEST_DIR=$testResourceDir"
if (jdk12OrLater) {
systemProperty 'java.security.manager', 'allow'
}
}

task compileJavaDOMBinding()
@@ -3832,6 +3839,10 @@ project(":systemTests") {
systemProperty "ClipShapeTest.numTests", rootProject.getProperty("ClipShapeTest.numTests")
}

if (jdk12OrLater) {
systemProperty 'java.security.manager', 'allow'
}

if (!IS_USE_ROBOT) {
// Disable all robot-based visual tests
exclude("test/robot/**");

This file was deleted.

1 comment on commit 9507ea4

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 9507ea4 May 24, 2021

Please sign in to comment.