From 098ec6eb5076f3a140777c5cb56be4465bfa432f Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 11 Mar 2019 10:09:48 +0000 Subject: Added to check MJIT constant for the Ruby 2.3-2.5. This commit picked from https://github.com/ruby/webrick/commit/2c13beca2c25dc099b7ed20dbe4d7ede77dfef86 Co-authored-by: Colby Swandale git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/webrick/test_httpserver.rb | 2 +- test/webrick/test_server.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/webrick') diff --git a/test/webrick/test_httpserver.rb b/test/webrick/test_httpserver.rb index a6e70da7e8..2e5d44940c 100644 --- a/test/webrick/test_httpserver.rb +++ b/test/webrick/test_httpserver.rb @@ -253,7 +253,7 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase server.virtual_host(WEBrick::HTTPServer.new(vhost_config)) Thread.pass while server.status != :Running - sleep 1 if RubyVM::MJIT.enabled? # server.status behaves unexpectedly with --jit-wait + sleep 1 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # server.status behaves unexpectedly with --jit-wait assert_equal(1, started, log.call) assert_equal(0, stopped, log.call) assert_equal(0, accepted, log.call) diff --git a/test/webrick/test_server.rb b/test/webrick/test_server.rb index 5f7f3a0b58..8162a186db 100644 --- a/test/webrick/test_server.rb +++ b/test/webrick/test_server.rb @@ -65,7 +65,7 @@ class TestWEBrickServer < Test::Unit::TestCase } TestWEBrick.start_server(Echo, config){|server, addr, port, log| true while server.status != :Running - sleep 1 if RubyVM::MJIT.enabled? # server.status behaves unexpectedly with --jit-wait + sleep 1 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # server.status behaves unexpectedly with --jit-wait assert_equal(1, started, log.call) assert_equal(0, stopped, log.call) assert_equal(0, accepted, log.call) -- cgit v1.2.3