From a6a3cf485df50940dfc292c4c52913c696ad5344 Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Thu, 6 Apr 2023 05:06:15 +0000 Subject: [PATCH] 8305480: test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java failing on 32 bit arm Reviewed-by: stuefe, dholmes --- .../jtreg/runtime/NMT/VirtualAllocCommitMerge.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java index 38e98991476..abae9cabcea 100644 --- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java +++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2023, 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 @@ -36,6 +36,7 @@ import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; import jdk.test.whitebox.WhiteBox; @@ -318,8 +319,12 @@ public class VirtualAllocCommitMerge { } public static void checkCommitted(OutputAnalyzer output, long addr, long size, String sizeString) { + // On ARM Thumb the stack is not walkable, so the location is not available and + // "from" string will not be present in the output. + // Disable assertion for ARM32. + String fromString = Platform.isARM() ? "" : "from.*"; output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + size) - + "\\] committed " + sizeString + " from.*"); + + "\\] committed " + sizeString + " " + fromString); } }