[前][次][番号順一覧][スレッド一覧]

ruby-changes:70308

From: Koichi <ko1@a...>
Date: Sun, 19 Dec 2021 01:07:26 +0900 (JST)
Subject: [ruby-changes:70308] 45de4025f5 (master): skip -v spec on MJIT

https://git.ruby-lang.org/ruby.git/commit/?id=45de4025f5

From 45de4025f522f5148f0fc730aa0a1695a87daca2 Mon Sep 17 00:00:00 2001
From: Koichi Sasada <ko1@a...>
Date: Sun, 19 Dec 2021 01:05:17 +0900
Subject: skip -v spec on MJIT

fix this failure:

```
configure ... cppflags=-DMJIT_FORCE_ENABLE
...
make test-spec

1)
The -v command line option when used alone prints version and ends FAILED
Expected
"ruby 3.1.0dev (2021-12-18T10:10:42Z master 78c175280b) +MJIT [x86_64-linux]
"
to include "ruby 3.1.0dev (2021-12-18T10:10:42Z master 78c175280b) [x86_64-linux]"
/tmp/ruby/v3/src/trunk-mjit-wait/spec/ruby/command_line/dash_v_spec.rb:9:in `block (3 levels) in <top (required)>'
/tmp/ruby/v3/src/trunk-mjit-wait/spec/ruby/command_line/dash_v_spec.rb:4:in `<top (required)>'
```

http://ci.rvm.jp/results/trunk-mjit-wait@phosphorus-docker/3759943
---
 spec/ruby/command_line/dash_v_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
index 89cef6c3bdc..a4f4dcd0517 100644
--- a/spec/ruby/command_line/dash_v_spec.rb
+++ b/spec/ruby/command_line/dash_v_spec.rb
@@ -7,6 +7,7 @@ describe "The -v command line option" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/command_line/dash_v_spec.rb#L7
   describe "when used alone" do
     it "prints version and ends" do
       ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION)
-    end unless defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled? # pending. not sure why MJIT doesn't need anything to fix this.
+    end unless (defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?) ||
+               (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?)
   end
 end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]