From b0a25c9cf8053c3e9a9a44a62cd54befde4ecdfc Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 22 May 2023 14:53:05 +0200 Subject: Revert "Apply timeout-scale to test_thr_kill." (#7838) This reverts commit bbbec4b87c1e66909f5bee9acd3e460b8c1ad663. Because the commit is a bug. The `apply_timeout_scale` to scale the timeout is called 2 times in the process. The `test/ruby/test_thread_queue.rb#test_thr_kill` is calling `EnvUtil.apply_timeout_scale`, and calling `tool/lib/core_assertions.rb#assert_normal_exit`. calling `tool/lib/envutil.rb#invoke_ruby` (`EnvUtil.invoke_ruby`) calling the `apply_timeout_scale`. ``` $ make test-all V=1 TESTS="-v test/ruby/test_thread_queue.rb -n TestThreadQueue#test_thr_kill --timeout-scale=2" ``` --- test/ruby/test_thread_queue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb index 3d2d1b23e9..72b0f557b6 100644 --- a/test/ruby/test_thread_queue.rb +++ b/test/ruby/test_thread_queue.rb @@ -208,7 +208,7 @@ class TestThreadQueue < Test::Unit::TestCase bug5343 = '[ruby-core:39634]' Dir.mktmpdir {|d| - timeout = EnvUtil.apply_timeout_scale(60) + timeout = 60 total_count = 250 begin assert_normal_exit(<<-"_eom", bug5343, timeout: timeout, chdir: d) -- cgit v1.2.3