OpenJDK / portola / portola
changeset 51968:2a1e47af3c6b
8211208: make AllocateHeapAt an unsupported option on AIX
Reviewed-by: shade, tschatzl
| author | mbaesken |
|---|---|
| date | Thu, 27 Sep 2018 17:13:07 +0200 |
| parents | 5ba442f14818 |
| children | a1c24d06e2b5 |
| files | src/hotspot/share/runtime/arguments.cpp test/hotspot/jtreg/gc/TestAllocateHeapAt.java test/hotspot/jtreg/gc/TestAllocateHeapAtError.java test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java |
| diffstat | 5 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Fri Sep 28 15:39:31 2018 +0300 +++ b/src/hotspot/share/runtime/arguments.cpp Thu Sep 27 17:13:07 2018 +0200 @@ -3851,6 +3851,10 @@ UNSUPPORTED_OPTION(UseLargePages); #endif +#if defined(AIX) + UNSUPPORTED_OPTION(AllocateHeapAt); +#endif + ArgumentsExt::report_unsupported_options(); #ifndef PRODUCT
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java Fri Sep 28 15:39:31 2018 +0300 +++ b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java Thu Sep 27 17:13:07 2018 +0200 @@ -24,7 +24,7 @@ /* @test TestAllocateHeapAt.java * @key gc * @summary Test to check allocation of Java Heap with AllocateHeapAt option - * @requires vm.gc != "Z" + * @requires vm.gc != "Z" & os.family != "aix" * @library /test/lib * @modules java.base/jdk.internal.misc */
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java Fri Sep 28 15:39:31 2018 +0300 +++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java Thu Sep 27 17:13:07 2018 +0200 @@ -24,7 +24,7 @@ /* @test TestAllocateHeapAtError.java * @key gc * @summary Test to check correct handling of non-existent directory passed to AllocateHeapAt option - * @requires vm.gc != "Z" + * @requires vm.gc != "Z" & os.family != "aix" * @library /test/lib * @modules java.base/jdk.internal.misc */
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java Fri Sep 28 15:39:31 2018 +0300 +++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java Thu Sep 27 17:13:07 2018 +0200 @@ -26,7 +26,7 @@ * @summary Test to check allocation of Java Heap with AllocateHeapAt option. Has multiple sub-tests to cover different code paths. * @library /test/lib * @modules java.base/jdk.internal.misc - * @requires vm.bits == "64" & vm.gc != "Z" + * @requires vm.bits == "64" & vm.gc != "Z" & os.family != "aix" */ import jdk.test.lib.JDKToolFinder;
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Fri Sep 28 15:39:31 2018 +0300 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Thu Sep 27 17:13:07 2018 +0200 @@ -28,7 +28,7 @@ * @test TestGCBasherWithAllocateHeapAt * @key gc stress * @requires vm.gc.G1 - * @requires vm.flavor == "server" & !vm.emulatedClient + * @requires vm.flavor == "server" & !vm.emulatedClient & os.family != "aix" * @summary Stress Java heap allocation with AllocateHeapAt flag using GC basher. * @run main/othervm/timeout=500 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC -XX:AllocateHeapAt=. TestGCBasherWithAllocateHeapAt 120000 */