8169004: Fix redundant @requires tags in tests

Reviewed-by: tschatzl, iignatyev
2026-07-30 12:50:11 +00:00 · 2018-07-31 12:24:47 -07:00 · 2018-07-31 12:24:47 -07:00 · fc9941ae72
commit fc9941ae72
parent ec76c2046c
30 changed files with 40 additions and 40 deletions
--- a/test/hotspot/jtreg/gc/TestNUMAPageSize.java
+++ b/test/hotspot/jtreg/gc/TestNUMAPageSize.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -26,7 +26,7 @@
 * @key gc regression
 * @summary Make sure that start up with NUMA support does not cause problems.
 * @bug 8061467
- * @requires (vm.opt.AggressiveOpts == null) | (vm.opt.AggressiveOpts == false)
+ * @requires vm.opt.AggressiveOpts != true
 * @run main/othervm -Xmx128m -XX:+UseNUMA TestNUMAPageSize
 */

--- a/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,8 @@
 * @test TestTargetSurvivorRatioFlag
 * @key gc
 * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
- * @requires (vm.opt.ExplicitGCInvokesConcurrent == null) | (vm.opt.ExplicitGCInvokesConcurrent == false)
- * @requires (vm.opt.UseJVMCICompiler == null) | (vm.opt.UseJVMCICompiler == false)
+ * @requires vm.opt.ExplicitGCInvokesConcurrent != true
+ * @requires vm.opt.UseJVMCICompiler != true
 * @requires vm.gc != "Z"
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@ -27,7 +27,7 @@
 * @summary Checks that decommitment occurs for JVM with different
 * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
 * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
+ * @requires vm.opt.AggressiveOpts != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 *          java.management
--- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java
+++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java
@ -24,7 +24,7 @@
 /*
 * @test ReservedStackTest
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 * @modules java.base/jdk.internal.vm.annotation
--- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java
+++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java
@ -26,7 +26,7 @@
 * @summary Run ReservedStackTest with dedicated compilers C1 and C2.
 *
 * @requires vm.flavor == "server" & !vm.emulatedClient
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
 * @modules java.base/jdk.internal.vm.annotation
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack001.java
@ -51,7 +51,7 @@
 *     4254634     println() while catching StackOverflowError causes hotspot VM crash
 *     4302288 the second stack overflow causes Classic VM to exit on win32
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack001
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack002.java
@ -52,7 +52,7 @@
 *     4254634     println() while catching StackOverflowError causes hotspot VM crash
 *     4302288 the second stack overflow causes Classic VM to exit on win32
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack002
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack003.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack003
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack004.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack004
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack005.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack005
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack006.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack006
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack007.java
@ -45,7 +45,7 @@
 *     See also the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack007
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java
@ -47,7 +47,7 @@
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
 * @ignore 8139875
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack008
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack009.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack009
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack010.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack010
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack011.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack011
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack012.java
@ -47,7 +47,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack012
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack013.java
@ -46,7 +46,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack013
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack014.java
@ -49,7 +49,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack014
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack015.java
@ -47,7 +47,7 @@
 *     See the bug:
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack015
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java
@ -50,7 +50,7 @@
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
 * @ignore 8139875
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack016 -eager
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java
@ -43,7 +43,7 @@
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
 * @ignore 8139875
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack017 -eager
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java
@ -48,7 +48,7 @@
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
 * @ignore 8139875
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack018 -eager
 */

--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java
@ -41,7 +41,7 @@
 *     4366625 (P4/S4) multiple stack overflow causes HS crash
 *
 * @ignore 8139875
- * @requires vm.opt.DeoptimizeALot == null | vm.opt.DeoptimizeALot == false
+ * @requires vm.opt.DeoptimizeALot != true
 * @run main/othervm nsk.stress.stack.stack019 -eager
 */