Skip to content

Commit 51a6923

Browse files
committed
8340146: ZGC: TestAllocateHeapAt.java should not run with UseLargePages
Backport-of: 4098acc200e608369ac1631dcc8513ea797bd59e
1 parent 6ae1a2d commit 51a6923

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

test/hotspot/jtreg/gc/x/TestAllocateHeapAt.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
2626
/*
2727
* @test TestAllocateHeapAt
2828
* @requires vm.gc.ZSinglegen & os.family == "linux"
29+
* @requires !vm.opt.final.UseLargePages
2930
* @summary Test ZGC with -XX:AllocateHeapAt
3031
* @library /test/lib
3132
* @run main/othervm gc.x.TestAllocateHeapAt . true

test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
2626
/*
2727
* @test TestAllocateHeapAt
2828
* @requires vm.gc.ZGenerational & os.family == "linux"
29+
* @requires !vm.opt.final.UseLargePages
2930
* @summary Test ZGC with -XX:AllocateHeapAt
3031
* @library /test/lib
3132
* @run main/othervm gc.z.TestAllocateHeapAt . true

test/jtreg-ext/requires/VMProps.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ protected void vmOptFinalFlags(SafeMap map) {
382382
vmOptFinalFlag(map, "EliminateAllocations");
383383
vmOptFinalFlag(map, "UnlockExperimentalVMOptions");
384384
vmOptFinalFlag(map, "UseCompressedOops");
385+
vmOptFinalFlag(map, "UseLargePages");
385386
vmOptFinalFlag(map, "UseVectorizedMismatchIntrinsic");
386387
vmOptFinalFlag(map, "UseVtableBasedCHA");
387388
vmOptFinalFlag(map, "ZGenerational");

0 commit comments

Comments
 (0)