8216271: Make AllocateOldGenAt an unsupported option on AIX
Reviewed-by: shade, tschatzl
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index a2ff6b8..a118b35 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -3819,6 +3819,7 @@
#if defined(AIX)
UNSUPPORTED_OPTION(AllocateHeapAt);
+ UNSUPPORTED_OPTION(AllocateOldGenAt);
#endif
ArgumentsExt::report_unsupported_options();
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java
index 5eea1ef..700ee6a 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/* @test TestAllocateOldGenAt.java
* @key gc
* @summary Test to check allocation of Java Heap with AllocateOldGenAt option
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @library /test/lib
* @modules java.base/jdk.internal.misc
*/
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java
index 4f0c4ae..45e9a16 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/* @test TestAllocateOldGenAtError.java
* @key gc
* @summary Test to check correct handling of non-existent directory passed to AllocateOldGenAt option
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @library /test/lib
* @modules java.base/jdk.internal.misc
*/
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java
index 819d4e6..7660a1d 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/* @test TestAllocateOldGenAtMultiple.java
* @key gc
* @summary Test to check allocation of Java Heap with AllocateOldGenAt option. Has multiple sub-tests to cover different code paths.
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @library /test/lib
* @modules java.base/jdk.internal.misc
* @requires vm.bits == "64"
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java b/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java
index 24fc1d5..961a7a2 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test TestHumongousObjectsOnNvdimm
* @summary Check that humongous objects reside in nv-dimm
* @library /test/lib /
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main TestHumongousObjectsOnNvdimm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java b/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java
index 8a14980..5175bbe 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/*
* @test TestOldObjectsOnNvdimm
* @summary Check that objects in old generation reside in dram.
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @library /test/lib
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java b/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java
index 4ea0dbc..11f7b8f 100644
--- a/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java
+++ b/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/*
* @test TestYoungObjectsOnDram
* @summary Check that objects in young generation reside in dram.
- * @requires vm.gc=="null"
+ * @requires vm.gc=="null" & os.family != "aix"
* @library /test/lib
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
