# HG changeset patch
# User stuefe
# Date 1540379170 -7200
#      Wed Oct 24 13:06:10 2018 +0200
# Node ID 80be2273342d31d94e9e224262f600ed753fde8e
# Parent  d682023cdd8c6d75feab0883ecf55986ac89e320
imported patch 8212913-fix-ThreadsListHandleInErrorHandlingTest-with-ShowRegistersOnAssert

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
--- a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
@@ -49,11 +49,15 @@
   public static void main(String[] args) throws Exception {
 
     // The -XX:ErrorHandlerTest=N option requires debug bits.
+    // Need to disable ShowRegistersOnAssert: that flag causes registers to be shown, which calls os::print_location,
+    //  which - as part of its checks - will iterate the threads list under a ThreadListHandle, changing the max nesting
+    // counters and confusing this test.
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
         "-XX:+UnlockDiagnosticVMOptions",
         "-Xmx100M",
         "-XX:ErrorHandlerTest=17",
         "-XX:-CreateCoredumpOnCrash",
+        "-XX:-ShowRegistersOnAssert",
         "-version");
 
     OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
@@ -49,11 +49,15 @@
   public static void main(String[] args) throws Exception {
 
     // The -XX:ErrorHandlerTest=N option requires debug bits.
+    // Need to disable ShowRegistersOnAssert: that flag causes registers to be shown, which calls os::print_location,
+    //  which - as part of its checks - will iterate the threads list under a ThreadListHandle, changing the max nesting
+    // counters and confusing this test.
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
         "-XX:+UnlockDiagnosticVMOptions",
         "-Xmx100M",
         "-XX:ErrorHandlerTest=16",
         "-XX:-CreateCoredumpOnCrash",
+        "-XX:-ShowRegistersOnAssert",
         "-version");
 
     OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());