From fa49651e05a06512e18ccb2f54a7198c9ff579de Mon Sep 17 00:00:00 2001
From: Jean Boussier <byroot@ruby-lang.org>
Date: Mon, 6 Feb 2023 12:30:50 +0100
Subject: Only emit circular dependency warning for owned thread shields

[Bug #19415]

If multiple threads attemps to load the same file concurrently
it's not a circular dependency issue.

So we check that the existing ThreadShield is owner by the current
fiber before warning about circular dependencies.
---
 test/ruby/test_require.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'test/ruby/test_require.rb')

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 604ddf09d8..e0cfc8c914 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -562,9 +562,6 @@ class TestRequire < Test::Unit::TestCase
 
       assert_equal(true, (t1_res ^ t2_res), bug5754 + " t1:#{t1_res} t2:#{t2_res}")
       assert_equal([:pre, :post], scratch, bug5754)
-
-      assert_match(/circular require/, output)
-      assert_match(/in #{__method__}'$/o, output)
     }
   ensure
     $VERBOSE = verbose
-- 
cgit v1.2.3