From 517405e462dc6104c33471c58242ea7b244c6218 Mon Sep 17 00:00:00 2001
From: Ao Qi <aoqi@openjdk.org>
Date: Wed, 22 Sep 2021 02:28:49 +0000
Subject: [PATCH] 8273965: some testlibrary_tests/ir_framework tests fail when
 c1 disabled

Reviewed-by: chagedorn, thartmann
---
 .../testlibrary_tests/ir_framework/tests/TestCompLevels.java    | 2 +-
 .../testlibrary_tests/ir_framework/tests/TestControls.java      | 2 +-
 .../testlibrary_tests/ir_framework/tests/TestRunTests.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java
index 4f373ca4027..b6007af7872 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompLevels.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
 
 /*
  * @test
- * @requires vm.flagless
+ * @requires vm.flagless & vm.compiler1.enabled
  * @summary Test if compilation levels are used correctly in the framework.
  *          This test partly runs directly the test VM which normally does and should not happen in user tests.
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
index 8dad488740a..f4d859e9232 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 
 /*
  * @test
- * @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler2.enabled & vm.flagless
+ * @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler1.enabled & vm.compiler2.enabled & vm.flagless
  * @summary Test if compilation control annotaions are handled correctly in the framework.
  *          This test partly runs directly the test VM which normally does and should not happen in user tests.
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
index db8fc9cca4d..21c4a4437f8 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
 
 /*
  * @test
- * @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler2.enabled & vm.flagless
+ * @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler1.enabled & vm.compiler2.enabled & vm.flagless
  * @summary Test different custom run tests.
  * @library /test/lib /testlibrary_tests /
  * @run driver ir_framework.tests.TestRunTests