From 858586ef446a9ca25254c03685d8498dc470b10c Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Wed, 22 Jan 2025 10:17:58 +0100 Subject: [PATCH] armhf does not support frame unwinding, simplify assertion Bug: https://bugs.openjdk.org/browse/JDK-8305480 os::current_frame() is stubbed out on armhf and this test fails. Simplify assertion as there is no "from xxxx" output on armhf. Gbp-Pq: Name update-assertion-for-armhf.patch --- test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java index 38e989914..43558bd69 100644 --- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java +++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java @@ -320,6 +320,6 @@ public class VirtualAllocCommitMerge { public static void checkCommitted(OutputAnalyzer output, long addr, long size, String sizeString) { output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + size) - + "\\] committed " + sizeString + " from.*"); + + "\\] committed " + sizeString + ".*"); } } -- 2.30.2