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

@@ -20,18 +20,20 @@
  * 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 /testlibrary/whitebox ..
+ * @library /testlibrary .. /../../test/lib
  * @build TestCodeHeapSizeOptions com.oracle.java.testlibrary.* codeheapsize.*
  *        common.*
  * @run main/timeout=240 codeheapsize.TestCodeHeapSizeOptions
  */
 public class TestCodeHeapSizeOptions extends CodeCacheCLITestBase {

@@ -41,11 +43,12 @@
                             EnumSet.noneOf(BlobType.class)),
                     new JVMStartupRunner());
 
     private static final CodeCacheCLITestCase CODE_CACHE_FREE_SPACE
             = new CodeCacheCLITestCase(new CodeCacheCLITestCase.Description(
-                            options -> options.segmented,
+                            options -> options.segmented
+                                    && Platform.isDebugBuild(),
                             EnumSet.noneOf(BlobType.class)),
                     new CodeCacheFreeSpaceRunner());
 
     private static final GenericCodeHeapSizeRunner GENERIC_RUNNER
             = new GenericCodeHeapSizeRunner();