[8u60] RFR of backport for 8049864: TestParallelHeapSizeFlags fails with unexpected heap size

[Kim Barrett]

On Mar 26, 2015, at 5:51 AM, Thomas Schatzl <thomas.schatzl at oracle.com> wrote:
> 
> Hi all,
> 
>  can I have reviews for the backport of "8049864:
> TestParallelHeapSizeFlags fails with unexpected heap size" for 8u60?
> 
> It did only apply with minor changes, so I need re-reviews. The problem
> is that the test TestParallelHeapSizeFlags.java, during a few
> intermediate steps (where an initial patch had been pushed, then
> reverted) got an @ignore tag added, changed and later removed.
> 
> The problem is that in the original revision, this code removed the
> final @ignore, however since I did not backport all these 5 or 6
> additional changes (which also touch other files sometimes), there is a
> conflict in removing the @ignore flag.
> 
> I.e this hunk
> --- a/test/gc/arguments/TestParallelHeapSizeFlags.java	Mon Sep 15
> 13:32:30 2014 +0000
> +++ b/test/gc/arguments/TestParallelHeapSizeFlags.java	Tue Jun 24 15:50:50 2014 +0200
> @@ -22,7 +22,6 @@
> */
> 
> /*
> - * @ignore 8049864
>  * @test TestParallelHeapSizeFlags
>  * @key gc
>  * @bug 8006088
> 
> Is not required for the backport.
> 
> Note that this change is based on "8067469: G1 ignores AlwaysPreTouch"
> which is also out for review. It fixes "8049536:
> os::commit_memory on Solaris uses alignment_hint as page size".
> 
> Full 8u60 changeset:
> http://cr.openjdk.java.net/~tschatzl/8049864-8u60/webrev.8u60/
> 
> CR:
> https://bugs.openjdk.java.net/browse/JDK-8049864
> Original change:
> http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/b326a3e8dcab

Looks good.