test/hotspot/jtreg/gc/survivorAlignment/SurvivorAlignmentTestMain.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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) 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 69,79 ****
      private static final String G1_EDEN = "G1 Eden Space";
      private static final String G1_SURVIVOR = "G1 Survivor Space";
      private static final String SERIAL_TENURED = "Tenured Gen";
      private static final String CMS_TENURED = "CMS Old Gen";
      private static final String PS_TENURED = "PS Old Gen";
!     private static final String G1_TENURED = "G1 Old Gen";
  
      private static final long G1_HEAP_REGION_SIZE = Optional.ofNullable(
              SurvivorAlignmentTestMain.WHITE_BOX.getUintxVMFlag(
                      "G1HeapRegionSize")).orElse(-1L);
  
--- 69,80 ----
      private static final String G1_EDEN = "G1 Eden Space";
      private static final String G1_SURVIVOR = "G1 Survivor Space";
      private static final String SERIAL_TENURED = "Tenured Gen";
      private static final String CMS_TENURED = "CMS Old Gen";
      private static final String PS_TENURED = "PS Old Gen";
!     private static final String G1_TENURED_LEGACY = "G1 Old Gen";
!     private static final String G1_TENURED = "G1 Old Space";
  
      private static final long G1_HEAP_REGION_SIZE = Optional.ofNullable(
              SurvivorAlignmentTestMain.WHITE_BOX.getUintxVMFlag(
                      "G1HeapRegionSize")).orElse(-1L);
  
*** 175,184 ****
--- 176,186 ----
                              AlignmentHelper.SURVIVOR_ALIGNMENT_IN_BYTES,
                              AlignmentHelper.MIN_OBJECT_SIZE, pool);
                      break;
                  case SurvivorAlignmentTestMain.SERIAL_TENURED:
                  case SurvivorAlignmentTestMain.PS_TENURED:
+                 case SurvivorAlignmentTestMain.G1_TENURED_LEGACY:
                  case SurvivorAlignmentTestMain.G1_TENURED:
                      Asserts.assertNull(tenuredHelper,
                              "Only one bean for tenured space is expected.");
                      tenuredHelper = new AlignmentHelper(
                              AlignmentHelper.OBJECT_ALIGNMENT_IN_BYTES,