From: Vladimir Petko Date: Thu, 27 Mar 2025 12:35:58 +0000 (+0100) Subject: armhf does not support frame unwinding, simplify assertion X-Git-Tag: archive/raspbian/17.0.15_5ea-1+rpi1^2~11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c9330215d4e63ba917f55e6fdbfde0c1b036ccd;p=openjdk-17.git 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 --- 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 + ".*"); } }