OpenJDK / jdk / jdk
changeset 51283:ac4f5ef0edd9
8169004: Fix redundant @requires tags in tests
Reviewed-by: tschatzl, iignatyev
line wrap: on
line diff
--- a/test/hotspot/jtreg/gc/TestNUMAPageSize.java Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/TestNUMAPageSize.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/arguments/TestTargetSurvivorRatioFlag.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack001.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack002.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack003.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack004.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack005.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack006.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack007.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack009.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack010.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack011.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack012.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack013.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack014.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack015.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 Wed Aug 01 09:23:24 2018 -0700 +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java Tue Jul 31 12:24:47 2018 -0700 @@ -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 */