Skip to content

Commit bc08c50

Browse files
author
Amos Shi
committed
8314837: 5 compiled/codecache tests ignore VM flags
Backport-of: 2a11bc41baec20cf670393ff29689043ed2d2114
1 parent 2bae839 commit bc08c50

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

test/hotspot/jtreg/compiler/codecache/CheckCodeCacheInfo.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
* @library /test/lib
2929
* @requires vm.debug
3030
*
31-
* @run driver jdk.test.lib.helpers.ClassFileInstaller
32-
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
33-
* compiler.codecache.CheckCodeCacheInfo
31+
* @run driver compiler.codecache.CheckCodeCacheInfo
3432
*/
3533

3634
package compiler.codecache;
@@ -69,9 +67,9 @@ public class CheckCodeCacheInfo {
6967
public static void main(String[] args) throws Exception {
7068
ProcessBuilder pb;
7169

72-
pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintCodeCache",
73-
"-XX:+Verbose",
74-
"-version");
70+
pb = ProcessTools.createTestJvm("-XX:+PrintCodeCache",
71+
"-XX:+Verbose",
72+
"-version");
7573
OutputAnalyzer out = new OutputAnalyzer(pb.start());
7674
out.shouldHaveExitValue(0);
7775
out.stdoutShouldMatch(VERBOSE_REGEXP);

test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* @test
3434
* @bug 8276036 8277213 8277441
3535
* @summary test for the value of full_count in the message of insufficient codecache
36+
* @requires vm.compMode != "Xint"
3637
* @library /test/lib
3738
*/
3839
public class CodeCacheFullCountTest {
@@ -54,7 +55,7 @@ public static void wasteCodeCache() throws Exception {
5455
}
5556

5657
public static void runTest() throws Throwable {
57-
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
58+
ProcessBuilder pb = ProcessTools.createTestJvm(
5859
"-XX:ReservedCodeCacheSize=2496k", "-XX:-UseCodeCacheFlushing", "CodeCacheFullCountTest", "WasteCodeCache");
5960
OutputAnalyzer oa = ProcessTools.executeProcess(pb);
6061
// Ignore adapter creation failures

test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* @test
2626
* @bug 8015774
2727
* @summary Verify SegmentedCodeCache option's processing
28+
* @requires vm.flagless
2829
* @library /test/lib /
2930
* @modules java.base/jdk.internal.misc
3031
* java.compiler

test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* @key randomness
2727
* @bug 8015774
2828
* @summary Verify processing of options related to code heaps sizing.
29+
* @requires vm.flagless
2930
* @library /test/lib /
3031
* @modules java.base/jdk.internal.misc
3132
* java.compiler

test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* @test
2626
* @bug 8015774
2727
* @summary Verify that PrintCodeCache option print correct information.
28+
* @requires vm.flagless
2829
* @library /test/lib /
2930
* @modules java.base/jdk.internal.misc
3031
* java.compiler

0 commit comments

Comments
 (0)