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 38e98991476a65a105a95c5004b75de02bd4987f..43558bd693f5a261ff2aed40ef6a1252ac20dc8e 100644 (file)
--- 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 + ".*");
     }
 }