test/gc/TestSmallHeap.java

rev 7655 : imported patch 8069011-requires

*** 23,42 ****
  
  /**
   * @test TestSmallHeap
   * @bug 8067438
   * @requires vm.gc=="null"
   * @summary Verify that starting the VM with a small heap works
   * @library /testlibrary /../../test/lib
   * @build TestSmallHeap
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseParallelGC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseSerialGC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseG1GC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseConcMarkSweepGC TestSmallHeap
!  *
!  * Note: It would be nice to verify the minimal supported heap size (2m) here,
   * but we align the heap size based on the card table size. And the card table
   * size is aligned based on the minimal pages size provided by the os. This
   * means that on most platforms, where the minimal page size is 4k, we get a
   * minimal heap size of 2m but on Solaris/Sparc we have a page size of 8k and
   * get a minimal heap size of 4m. And on platforms where the page size is 64k
--- 23,44 ----
  
  /**
   * @test TestSmallHeap
   * @bug 8067438
   * @requires vm.gc=="null"
+  * @requires (vm.opt.AggressiveOpts=="null") | (vm.opt.AggressiveOpts=="false")
   * @summary Verify that starting the VM with a small heap works
   * @library /testlibrary /../../test/lib
   * @build TestSmallHeap
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseParallelGC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseSerialGC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseG1GC TestSmallHeap
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseConcMarkSweepGC TestSmallHeap
!  */
! 
! /* Note: It would be nice to verify the minimal supported heap size (2m) here,
   * but we align the heap size based on the card table size. And the card table
   * size is aligned based on the minimal pages size provided by the os. This
   * means that on most platforms, where the minimal page size is 4k, we get a
   * minimal heap size of 2m but on Solaris/Sparc we have a page size of 8k and
   * get a minimal heap size of 4m. And on platforms where the page size is 64k