1 files changed, 23 insertions, 21 deletions
diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb
index 734db8d519..a2b817bad8 100644
--- a/spec/ruby/command_line/rubyopt_spec.rb
+++ b/spec/ruby/command_line/rubyopt_spec.rb
@@ -11,14 +11,14 @@ describe "Processing RUBYOPT" do
 
   it "adds the -I path to $LOAD_PATH" do
     ENV["RUBYOPT"] = "-Ioptrubyspecincl"
-    result = ruby_exe("puts $LOAD_PATH.grep(/byspecin/)")
+    result = ruby_exe("puts $LOAD_PATH.grep(/byspecin/)", escape: true)
     result.chomp[-15..-1].should == "optrubyspecincl"
   end
 
   it "sets $DEBUG to true for '-d'" do
     ENV["RUBYOPT"] = '-d'
     command = %[puts "value of $DEBUG is \#{$DEBUG}"]
-    result = ruby_exe(command, args: "2>&1")
+    result = ruby_exe(command, escape: true, args: "2>&1")
     result.should =~ /value of \$DEBUG is true/
   end
 
@@ -36,45 +36,47 @@ describe "Processing RUBYOPT" do
 
   it "sets $VERBOSE to true for '-w'" do
     ENV["RUBYOPT"] = '-w'
-    ruby_exe("p $VERBOSE").chomp.should == "true"
+    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
   end
 
   it "sets $VERBOSE to true for '-W'" do
     ENV["RUBYOPT"] = '-W'
-    ruby_exe("p $VERBOSE").chomp.should == "true"
+    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
   end
 
   it "sets $VERBOSE to nil for '-W0'" do
     ENV["RUBYOPT"] = '-W0'
-    ruby_exe("p $VERBOSE").chomp.should == "nil"
+    ruby_exe("p $VERBOSE", escape: true).chomp.should == "nil"
   end
 
   it "sets $VERBOSE to false for '-W1'" do
     ENV["RUBYOPT"] = '-W1'
-    ruby_exe("p $VERBOSE").chomp.should == "false"
+    ruby_exe("p $VERBOSE", escape: true).chomp.should == "false"
   end
 
   it "sets $VERBOSE to true for '-W2'" do
     ENV["RUBYOPT"] = '-W2'
-    ruby_exe("p $VERBOSE").chomp.should == "true"
+    ruby_exe("p $VERBOSE", escape: true).chomp.should == "true"
   end
 
-  it "suppresses deprecation warnings for '-W:no-deprecated'" do
-    ENV["RUBYOPT"] = '-W:no-deprecated'
-    result = ruby_exe('$; = ""', args: '2>&1')
-    result.should == ""
-  end
+  ruby_version_is "2.7" do
+    it "suppresses deprecation warnings for '-W:no-deprecated'" do
+      ENV["RUBYOPT"] = '-W:no-deprecated'
+      result = ruby_exe('$; = ""', args: '2>&1')
+      result.should == ""
+    end
 
-  it "suppresses experimental warnings for '-W:no-experimental'" do
-    ENV["RUBYOPT"] = '-W:no-experimental'
-    result = ruby_exe('case 0; in a; end', args: '2>&1')
-    result.should == ""
-  end
+    it "suppresses experimental warnings for '-W:no-experimental'" do
+      ENV["RUBYOPT"] = '-W:no-experimental'
+      result = ruby_exe('case 0; in a; end', args: '2>&1')
+      result.should == ""
+    end
 
-  it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
-    ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
-    result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
-    result.should == ""
+    it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
+      ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
+      result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
+      result.should == ""
+    end
   end
 
   it "requires the file for '-r'" do