8226795: compiler/tiered/Level2RecompilationTest.java fails when XX:TieredStopAtLevel=1/2/3 is set
Reviewed-by: redestad
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java Wed Nov 13 10:59:25 2019 -0800
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java Wed Nov 13 11:34:31 2019 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -25,8 +25,13 @@
* @test
* @bug 8189439
* @summary Parameters type profiling is not performed from aarch64 interpreter
+ *
* @requires os.arch != "arm"
* @requires vm.flavor == "server" & vm.compMode == "Xmixed" & !vm.emulatedClient & !vm.graal.enabled
+ *
+ * @comment the test can't be run w/ TieredStopAtLevel < 4
+ * @requires vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4
+ *
* @library /test/lib /
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java Wed Nov 13 10:59:25 2019 -0800
+++ b/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java Wed Nov 13 11:34:31 2019 -0800
@@ -28,6 +28,9 @@
* @modules java.base/jdk.internal.misc
* java.management
*
+ * @comment the test can't be run w/ TieredStopAtLevel < 4
+ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ *
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/compiler/whitebox/OSRFailureLevel4Test.java Wed Nov 13 10:59:25 2019 -0800
+++ b/test/hotspot/jtreg/compiler/whitebox/OSRFailureLevel4Test.java Wed Nov 13 11:34:31 2019 -0800
@@ -27,6 +27,10 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
+ *
+ * @comment the test can't be run w/ TieredStopAtLevel < 4
+ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ *
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission