test/gc/arguments/TestG1HeapRegionSize.java

*** 1,7 ****
  /*
! * Copyright (c) 2013, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
--- 1,7 ----
  /*
! * Copyright (c) 2013, 2014, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
*** 23,32 ****
--- 23,33 ----
  
  /*
   * @test TestG1HeapRegionSize
   * @key gc
   * @bug 8021879
+  * @requires vm.gc=="G1"
   * @summary Verify that the flag G1HeapRegionSize is updated properly
   * @run main/othervm -Xmx64m TestG1HeapRegionSize 1048576
   * @run main/othervm -XX:G1HeapRegionSize=2m -Xmx64m TestG1HeapRegionSize 2097152
   * @run main/othervm -XX:G1HeapRegionSize=3m -Xmx64m TestG1HeapRegionSize 2097152
   * @run main/othervm -XX:G1HeapRegionSize=64m -Xmx256m TestG1HeapRegionSize 33554432
*** 39,56 ****
  public class TestG1HeapRegionSize {
  
    public static void main(String[] args) {
      HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
  
-     VMOption option = diagnostic.getVMOption("UseG1GC");
-     if (option.getValue().equals("false")) {
-       System.out.println("Skipping this test. It is only a G1 test.");
-       return;
-     }
- 
      String expectedValue = getExpectedValue(args);
!     option = diagnostic.getVMOption("G1HeapRegionSize");
      if (!expectedValue.equals(option.getValue())) {
        throw new RuntimeException("Wrong value for G1HeapRegionSize. Expected " + expectedValue + " but got " + option.getValue());
      }
    }
  
--- 40,51 ----
  public class TestG1HeapRegionSize {
  
    public static void main(String[] args) {
      HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
  
      String expectedValue = getExpectedValue(args);
!     VMOption option = diagnostic.getVMOption("G1HeapRegionSize");
      if (!expectedValue.equals(option.getValue())) {
        throw new RuntimeException("Wrong value for G1HeapRegionSize. Expected " + expectedValue + " but got " + option.getValue());
      }
    }