From b6d70f2c49da6f99e3a0a84b1df6e3d48c7e2e58 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Tue, 14 Mar 2023 08:08:28 +0000 Subject: [PATCH] 8303973: Library detection in runtime/ErrorHandling/TestDwarf.java fails on ppc64le RHEL8.5 for libpthread-2.28.so Reviewed-by: chagedorn --- test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java index 244cda0d24a..fe0ce208d36 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 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 @@ -171,9 +171,9 @@ public class TestDwarf { * There are some valid cases where we cannot find source information. Check these. */ private static void checkNoSourceLine(String crashOutputString, String line) { - Pattern pattern = Pattern.compile("[CV][\\s\\t]+\\[([a-zA-Z0-9_.]+)\\+0x.+]"); + Pattern pattern = Pattern.compile("[CV][\\s\\t]+\\[([a-zA-Z0-9_.-]+)\\+0x.+]"); Matcher matcher = pattern.matcher(line); - Asserts.assertTrue(matcher.find(), "Must find library in \"" + line + "\""); + Asserts.assertTrue(matcher.find(), "Must find library name in \"" + line + "\""); // Check if there are symbols available for library. If not, then we cannot find any source information for this library. // This can happen if this test is run without any JDK debug symbols at all but also for some libraries like libpthread.so // which usually has no symbols available.