test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 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.

*** 25,11 ***
  /**
   * @test
   * @summary Test OOME in due to classloader leak
   * @requires vm.gc.Shenandoah
   * @library /test/lib
!  * @run driver TestClassLoaderLeak
   */
  
  import java.util.*;
  import java.io.*;
  import java.nio.*;
--- 26,11 ---
  /**
   * @test
   * @summary Test OOME in due to classloader leak
   * @requires vm.gc.Shenandoah
   * @library /test/lib
!  * @run driver/timeout=600 TestClassLoaderLeak
   */
  
  import java.util.*;
  import java.io.*;
  import java.nio.*;

*** 121,13 ***
              System.out.println("All good");
              return;
          }
  
          String[][][] modeHeuristics = new String[][][] {
!              {{"satb"},    {"adaptive", "compact", "static", "aggressive"}},
!              {{"iu"},      {"adaptive", "aggressive"}},
!              {{"passive"}, {"passive"}}
          };
  
          for (String[][] mh : modeHeuristics) {
              String mode = mh[0][0];
              String[] heuristics = mh[1];
--- 122,14 ---
              System.out.println("All good");
              return;
          }
  
          String[][][] modeHeuristics = new String[][][] {
!              {{"satb"},         {"adaptive", "compact", "static", "aggressive"}},
!              {{"iu"},           {"adaptive", "aggressive"}},
!              {{"passive"},      {"passive"}},
+              {{"generational"}, {"adaptive"}}
          };
  
          for (String[][] mh : modeHeuristics) {
              String mode = mh[0][0];
              String[] heuristics = mh[1];