test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java

*** 20,37 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package codeheapsize;
  
  import common.CodeCacheCLITestBase;
  import common.CodeCacheCLITestCase;
  import sun.hotspot.code.BlobType;
  import java.util.EnumSet;
  /**
   * @test
   * @summary Verify processing of options related to code heaps sizing.
!  * @library /testlibrary /testlibrary/whitebox ..
   * @build TestCodeHeapSizeOptions com.oracle.java.testlibrary.* codeheapsize.*
   *        common.*
   * @run main/timeout=240 codeheapsize.TestCodeHeapSizeOptions
   */
  public class TestCodeHeapSizeOptions extends CodeCacheCLITestBase {
--- 20,39 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package codeheapsize;
  
+ import com.oracle.java.testlibrary.Platform;
  import common.CodeCacheCLITestBase;
  import common.CodeCacheCLITestCase;
  import sun.hotspot.code.BlobType;
  import java.util.EnumSet;
  /**
   * @test
+  * @bug 8015774
   * @summary Verify processing of options related to code heaps sizing.
!  * @library /testlibrary .. /../../test/lib
   * @build TestCodeHeapSizeOptions com.oracle.java.testlibrary.* codeheapsize.*
   *        common.*
   * @run main/timeout=240 codeheapsize.TestCodeHeapSizeOptions
   */
  public class TestCodeHeapSizeOptions extends CodeCacheCLITestBase {
*** 41,51 ****
                              EnumSet.noneOf(BlobType.class)),
                      new JVMStartupRunner());
  
      private static final CodeCacheCLITestCase CODE_CACHE_FREE_SPACE
              = new CodeCacheCLITestCase(new CodeCacheCLITestCase.Description(
!                             options -> options.segmented,
                              EnumSet.noneOf(BlobType.class)),
                      new CodeCacheFreeSpaceRunner());
  
      private static final GenericCodeHeapSizeRunner GENERIC_RUNNER
              = new GenericCodeHeapSizeRunner();
--- 43,54 ----
                              EnumSet.noneOf(BlobType.class)),
                      new JVMStartupRunner());
  
      private static final CodeCacheCLITestCase CODE_CACHE_FREE_SPACE
              = new CodeCacheCLITestCase(new CodeCacheCLITestCase.Description(
!                             options -> options.segmented
!                                     && Platform.isDebugBuild(),
                              EnumSet.noneOf(BlobType.class)),
                      new CodeCacheFreeSpaceRunner());
  
      private static final GenericCodeHeapSizeRunner GENERIC_RUNNER
              = new GenericCodeHeapSizeRunner();