From 2df80d30fe6ee217ae8a7b350601da620d775f35 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 May 2018 08:46:36 +0000
Subject: 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/ruby/command_line/dash_v_spec.rb  |  9 +--------
 spec/ruby/command_line/rubyopt_spec.rb | 12 ++----------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
index 36e73a2cba..995a46a87f 100644
--- a/spec/ruby/command_line/dash_v_spec.rb
+++ b/spec/ruby/command_line/dash_v_spec.rb
@@ -6,14 +6,7 @@ describe "The -v command line option" do
 
   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
diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb
index 87a826e254..81a57f97c3 100644
--- a/spec/ruby/command_line/rubyopt_spec.rb
+++ b/spec/ruby/command_line/rubyopt_spec.rb
@@ -22,22 +22,14 @@ describe "Processing RUBYOPT" do
     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
-- 
cgit v1.2.3