OpenJDK / jdk / jdk
changeset 53214:386df79e2011
8216271: Make AllocateOldGenAt an unsupported option on AIX.
Reviewed-by: shade, tschatzl
| author | goetz |
|---|---|
| date | Tue, 08 Jan 2019 09:29:36 +0100 |
| parents | 6af596144294 |
| children | 299fe76c25c7 |
| files | src/hotspot/share/runtime/arguments.cpp test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java |
| diffstat | 7 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Mon Jan 07 12:22:31 2019 +0100 +++ b/src/hotspot/share/runtime/arguments.cpp Tue Jan 08 09:29:36 2019 +0100 @@ -3819,6 +3819,7 @@ #if defined(AIX) UNSUPPORTED_OPTION(AllocateHeapAt); + UNSUPPORTED_OPTION(AllocateOldGenAt); #endif ArgumentsExt::report_unsupported_options();
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java Tue Jan 08 09:29:36 2019 +0100 @@ -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 */
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java Tue Jan 08 09:29:36 2019 +0100 @@ -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 */
--- a/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java Tue Jan 08 09:29:36 2019 +0100 @@ -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"
--- a/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java Tue Jan 08 09:29:36 2019 +0100 @@ -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
--- a/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java Tue Jan 08 09:29:36 2019 +0100 @@ -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
--- a/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java Mon Jan 07 12:22:31 2019 +0100 +++ b/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java Tue Jan 08 09:29:36 2019 +0100 @@ -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