archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8146435: [TESTBUG] Logging tests are failing intermittently on windows when executed by JPRT

Browse source 
Improved robustness of UL tests by removing reliance on "java -version" and replacing with explicit code to trigger logging in all environments

Reviewed-by: dholmes, iklam, mockner
This commit is contained in:
Rachel Protacio 2016-01-21 12:11:20 -05:00
parent e8e6b0e6f0
commit 6ee07f50c8
11 changed files with 128 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

30
hotspot/test/runtime/logging/ClassInitializationTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2016, 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
@ -40,7 +40,10 @@ public class ClassInitializationTest {
public static void main(String... args) throws Exception {
// (1)
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:classinit=info", "-Xverify:all", "-Xmx64m", "BadMap50");
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:classinit=info",
"-Xverify:all",
"-Xmx64m",
"BadMap50");
OutputAnalyzer out = new OutputAnalyzer(pb.start());
out.shouldContain("Start class verification for:");
out.shouldContain("End class verification for:");
@ -50,16 +53,29 @@ public class ClassInitializationTest {
// (2)
if (Platform.isDebugBuild()) {
pb = ProcessTools.createJavaProcessBuilder("-Xlog:classinit=info", "-Xverify:all", "-XX:+EagerInitialization", "-Xmx64m", "-version");
out = new OutputAnalyzer(pb.start());
out.shouldContain("[Initialized").shouldContain("without side effects]");
out.shouldHaveExitValue(0);
pb = ProcessTools.createJavaProcessBuilder("-Xlog:classinit=info",
"-Xverify:all",
"-XX:+EagerInitialization",
"-Xmx64m",
InnerClass.class.getName());
out = new OutputAnalyzer(pb.start());
out.shouldContain("[Initialized").shouldContain("without side effects]");
out.shouldHaveExitValue(0);
}
// (3) Ensure that VerboseVerification still triggers appropriate messages.
pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions", "-XX:+VerboseVerification", "-Xverify:all", "-Xmx64m", "BadMap50");
pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
"-XX:+VerboseVerification",
"-Xverify:all",
"-Xmx64m",
"BadMap50");
out = new OutputAnalyzer(pb.start());
out.shouldContain("End class verification for:");
out.shouldContain("Verification for BadMap50 failed");
out.shouldContain("Fail over class verification to old verifier for: BadMap50");
}
public static class InnerClass {
public static void main(String[] args) throws Exception {
System.out.println("Inner Class");
}
}
}