stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8161208: Unable to run jtreg tests with MinimalVM

Browse Source 
Reviewed-by: dholmes, dfazunen
This commit is contained in:
Michail Chernov 2016-07-21 16:07:41 +03:00
parent 89577d9c2a
commit a4dd98020c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/jtreg-ext/requires/VMProps.java
View File

@ -23,8 +23,6 @@
package requires;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
@ -35,14 +33,18 @@ import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import sun.hotspot.gc.GC;
import sun.hotspot.WhiteBox;
/**
* The Class to be invoked by jtreg prior Test Suite execution to
* collect information about VM.
* Do not use any API's that may not be available in all target VMs.
* Properties set by this Class will be available in the @requires expressions.
*/
public class VMProps implements Callable<Map<String, String>> {
private static final WhiteBox WB = WhiteBox.getWhiteBox();
/**
* Collects information about VM properties.
* This method will be invoked by jtreg.
@ -131,17 +133,14 @@ public class VMProps implements Callable<Map<String, String>> {
* @return "true" if Flight Recorder is enabled, "false" if is disabled.
*/
protected String vmFlightRecorder() {
RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
List<String> arguments = runtimeMxBean.getInputArguments();
if (arguments.contains("-XX:+UnlockCommercialFeatures")) {
if (arguments.contains("-XX:+FlightRecorder")) {
Boolean isUnlockedCommercialFatures = WB.getBooleanVMFlag("UnlockCommercialFeatures");
Boolean isFlightRecorder = WB.getBooleanVMFlag("FlightRecorder");
String startFROptions = WB.getStringVMFlag("StartFlightRecording");
if (isUnlockedCommercialFatures != null && isUnlockedCommercialFatures) {
if (isFlightRecorder != null && isFlightRecorder) {
return "true";
}
if (arguments.contains("-XX:-FlightRecorder")) {
return "false";
}
if (arguments.stream()
.anyMatch(option -> option.startsWith("-XX:StartFlightRecording"))) {
if (startFROptions != null && !startFROptions.isEmpty()) {
return "true";
}
}