File tree Expand file tree Collapse file tree 2 files changed +11
-128
lines changed
modules/javafx.graphics/src/test/java/test/javafx/concurrent Expand file tree Collapse file tree 2 files changed +11
-128
lines changed Original file line number Diff line number Diff line change @@ -622,6 +622,10 @@ try {
622
622
def jdkVersionInfo = parseJavaVersion(ver)
623
623
defineProperty(" jdkVersion" , jdkVersionInfo[0 ])
624
624
defineProperty(" jdkBuildNumber" , jdkVersionInfo[1 ])
625
+
626
+ // Define global properties based on the version of Java
627
+ def status = compareJdkVersion(jdkVersion, " 12" )
628
+ ext. jdk12OrLater = (status >= 0 )
625
629
}
626
630
}
627
631
} finally {
@@ -3456,6 +3460,9 @@ project(":web") {
3456
3460
dependsOn webArchiveJar
3457
3461
def testResourceDir = file(" $buildDir /testing/resources" )
3458
3462
jvmArgs " -DWEB_ARCHIVE_JAR_TEST_DIR=$testResourceDir "
3463
+ if (jdk12OrLater) {
3464
+ systemProperty ' java.security.manager' , ' allow'
3465
+ }
3459
3466
}
3460
3467
3461
3468
task compileJavaDOMBinding()
@@ -3832,6 +3839,10 @@ project(":systemTests") {
3832
3839
systemProperty " ClipShapeTest.numTests" , rootProject. getProperty(" ClipShapeTest.numTests" )
3833
3840
}
3834
3841
3842
+ if (jdk12OrLater) {
3843
+ systemProperty ' java.security.manager' , ' allow'
3844
+ }
3845
+
3835
3846
if (! IS_USE_ROBOT ) {
3836
3847
// Disable all robot-based visual tests
3837
3848
exclude(" test/robot/**" );
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments