infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-06 03:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8319648: java/lang/SecurityManager tests ignore vm flags

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Matthew Donovan 2024-03-01 12:23:17 +00:00
parent e85265abc2
commit 437cf354e2
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jdk/java/lang/SecurityManager/modules/CustomSecurityManagerTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -64,7 +64,7 @@ public class CustomSecurityManagerTest {
@Test(dataProvider = "testCases")
public void testProvider(List<String> args) throws Throwable {
ProcessBuilder processBuilder = ProcessTools.createLimitedTestJavaProcessBuilder(args);
ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(args);
OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder);
outputAnalyzer.shouldHaveExitValue(0);
}

10
test/jdk/java/lang/System/SecurityManagerWarnings.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,7 +28,6 @@
* @library /test/lib
*/
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.util.JarUtils;
@ -51,6 +50,7 @@ public class SecurityManagerWarnings {
};
""");
System.setProperty("test.noclasspath", "true");
String testClasses = System.getProperty("test.classes");
disallowTest(null, testClasses);
@ -131,13 +131,11 @@ public class SecurityManagerWarnings {
static OutputAnalyzer run(String prop, String cp) throws Exception {
ProcessBuilder pb;
if (prop == null) {
pb = new ProcessBuilder(
JDKToolFinder.getJDKTool("java"),
pb = ProcessTools.createTestJavaProcessBuilder(
"-cp", cp,
"SecurityManagerWarnings", "run");
} else {
pb = new ProcessBuilder(
JDKToolFinder.getJDKTool("java"),
pb = ProcessTools.createTestJavaProcessBuilder(
"-cp", cp,
"-Djava.security.manager=" + prop,
"-Djava.security.policy=policy",