From ed410f6a53f319d93e799446d427bbd4f81ef053 Mon Sep 17 00:00:00 2001 From: Tyler Steele Date: Wed, 23 Feb 2022 11:29:19 -0700 Subject: [PATCH 1/2] Trial Solution: Replaces shouldContain with shouldMatch + Regex in ResolvedClassTest --- test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java index 44b21cb68157a..34db332e6c674 100644 --- a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java +++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java @@ -125,9 +125,9 @@ static void testIndy() throws IOException { analyzer.shouldHaveExitValue(0); - analyzer.shouldNotContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes) not inlineable"); + analyzer.shouldNotMatch("@ 3 java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) not inlineable"); - analyzer.shouldContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes) force inline by annotation"); + analyzer.shouldMatch("@ 3 java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) force inline by annotation"); analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded) not inlineable"); } From 0455aff688b4682bd48492f031bed87b037ce12f Mon Sep 17 00:00:00 2001 From: Tyler Steele Date: Fri, 4 Mar 2022 09:29:18 -0700 Subject: [PATCH 2/2] Remove leading chars not present in original test --- test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java index 34db332e6c674..92263bf10cf3e 100644 --- a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java +++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java @@ -125,9 +125,9 @@ static void testIndy() throws IOException { analyzer.shouldHaveExitValue(0); - analyzer.shouldNotMatch("@ 3 java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) not inlineable"); + analyzer.shouldNotMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) not inlineable"); - analyzer.shouldMatch("@ 3 java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) force inline by annotation"); + analyzer.shouldMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\) force inline by annotation"); analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded) not inlineable"); }