test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. 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.

*** 20,20 ***
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /* @test
   * @summary test JNI critical arrays support in Shenandoah
   * @key randomness
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   *
   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify                 TestJNICritical
   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestJNICritical
   */
  
  import java.util.Arrays;
  import java.util.Random;
  import jdk.test.lib.Utils;
  
  public class TestJNICritical {
--- 21,30 ---
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /* @test id=default
   * @summary test JNI critical arrays support in Shenandoah
   * @key randomness
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   *
   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify                 TestJNICritical
   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestJNICritical
   */
  
+  /* @test id=generational
+   * @summary test JNI critical arrays support in Shenandoah
+   * @key randomness
+   * @requires vm.gc.Shenandoah
+   * @library /test/lib
+   *
+   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:+ShenandoahVerify TestJNICritical
+   * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational                       TestJNICritical
+   */
+ 
  import java.util.Arrays;
  import java.util.Random;
  import jdk.test.lib.Utils;
  
  public class TestJNICritical {