nobu	2018-05-29 17:46:36 +0900 (Tue, 29 May 2018)

  New Revision: 63521

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63521

  Log:
    spec/ruby: revert r63503 and r63508
    
    When RUBY_DESCRIPTION has `+JIT` already, it will be doubled.
    Just fake.rb.in always has copied `RUBY_DESCRIPTION`, regardless
    MJIT is enabled or not.  `BOOTSTRAPRUBY` is not involved.

  Modified files:
    trunk/spec/ruby/command_line/dash_v_spec.rb
    trunk/spec/ruby/command_line/rubyopt_spec.rb
Index: spec/ruby/command_line/dash_v_spec.rb
===================================================================
--- spec/ruby/command_line/dash_v_spec.rb	(revision 63520)
+++ spec/ruby/command_line/dash_v_spec.rb	(revision 63521)
@@ -6,14 +6,7 @@ describe "The -v command line option" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/command_line/dash_v_spec.rb#L6
 
   describe "when used alone" do
     it "prints version and ends" do
-      ruby_description =
-        if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-          # fake.rb always drops +JIT from RUBY_DESCRIPTION. This resurrects that.
-          RUBY_DESCRIPTION.sub(/ \[[^\]]+\]$/, ' +JIT\0')
-        else
-          RUBY_DESCRIPTION
-        end
-      ruby_exe(nil, args: '-v').include?(ruby_description).should == true
+      ruby_exe(nil, args: '-v').include?(RUBY_DESCRIPTION).should == true
     end
   end
 end
Index: spec/ruby/command_line/rubyopt_spec.rb
===================================================================
--- spec/ruby/command_line/rubyopt_spec.rb	(revision 63520)
+++ spec/ruby/command_line/rubyopt_spec.rb	(revision 63521)
@@ -22,22 +22,14 @@ describe "Processing RUBYOPT" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/command_line/rubyopt_spec.rb#L22
     result.should =~ /value of \$DEBUG is true/
   end
 
-  ruby_description =
-    if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-      # fake.rb always drops +JIT from RUBY_DESCRIPTION. This resurrects that.
-      RUBY_DESCRIPTION.sub(/ \[[^\]]+\]$/, ' +JIT\0')
-    else
-      RUBY_DESCRIPTION
-    end
-
   it "prints the version number for '-v'" do
     ENV["RUBYOPT"] = '-v'
-    ruby_exe("")[/\A.*/].should == ruby_description
+    ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
   end
 
   it "ignores whitespace around the option" do
     ENV["RUBYOPT"] = ' -v '
-    ruby_exe("")[/\A.*/].should == ruby_description
+    ruby_exe("")[/\A.*/].should == RUBY_DESCRIPTION
   end
 
   it "sets $VERBOSE to true for '-w'" do

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