From 759dce180ba7a88ad8a51509200d780948957d3a Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 13 May 2026 13:37:15 +0000
Subject: [PATCH] 8384505: Account for all jtreg-based frames in stack walk
 test

Reviewed-by: dfuchs, alanb
---
 test/jdk/java/lang/StackWalker/StackWalkTest.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/lang/StackWalker/StackWalkTest.java b/test/jdk/java/lang/StackWalker/StackWalkTest.java
index 8848f323cab..0cfb570ba7f 100644
--- a/test/jdk/java/lang/StackWalker/StackWalkTest.java
+++ b/test/jdk/java/lang/StackWalker/StackWalkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, 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
@@ -56,11 +56,11 @@ public class StackWalkTest {
     static final Set<String> infrastructureClasses = new TreeSet<>(Arrays.asList(
             "jdk.internal.reflect.DirectMethodHandleAccessor",
             "java.lang.reflect.Method",
-            "com.sun.javatest.regtest.MainWrapper$MainThread",
-            "com.sun.javatest.regtest.agent.MainWrapper$MainThread",
-            "com.sun.javatest.regtest.agent.MainWrapper$MainTask",
             "java.lang.Thread"
     ));
+    static final List<String> infrastructurePackages = List.of(
+            "com.sun.javatest.regtest."
+    );
     static final List<Class<?>> streamPipelines = Arrays.asList(
         classForName("java.util.stream.AbstractPipeline"),
         classForName("java.util.stream.TerminalOp")
@@ -131,6 +131,12 @@ public class StackWalkTest {
                 // safe to ignore
                 return;
             }
+            for (String prefix : infrastructurePackages) {
+                if (sf.getClassName().startsWith(prefix)) {
+                    // safe to ignore
+                    return;
+                }
+            }
         }
         try {
             recorder.compareFrame(count, sf);