--- old/test/hotspot/jtreg/gc/TestFullGCCount.java 2018-12-03 17:46:15.444921421 +0100 +++ new/test/hotspot/jtreg/gc/TestFullGCCount.java 2018-12-03 17:46:15.298922464 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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,7 +25,9 @@ * @test TestFullGCCount.java * @bug 7072527 * @summary CMS: JMM GC counters overcount in some cases - * @requires !(vm.gc.ConcMarkSweep & vm.opt.ExplicitGCInvokesConcurrent == true) + * @requires !(vm.gc == "ConcMarkSweep" & vm.opt.ExplicitGCInvokesConcurrent == true) + * @comment Shenandoah has "ExplicitGCInvokesConcurrent" on by default + * @requires !(vm.gc == "Shenandoah" & vm.opt.ExplicitGCInvokesConcurrent != false) * @modules java.management * @run main/othervm -Xlog:gc TestFullGCCount */