1 files changed, 38 insertions, 20 deletions
diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb
index 2db42f77ef..bbea4d557d 100644
--- a/spec/ruby/command_line/rubyopt_spec.rb
+++ b/spec/ruby/command_line/rubyopt_spec.rb
@@ -59,6 +59,24 @@ describe "Processing RUBYOPT" do
     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
+
+  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 == ""
+  end
+
   it "requires the file for '-r'" do
     f = fixture __FILE__, "rubyopt"
     ENV["RUBYOPT"] = "-r#{f}"
@@ -67,101 +85,101 @@ describe "Processing RUBYOPT" do
 
   it "raises a RuntimeError for '-a'" do
     ENV["RUBYOPT"] = '-a'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-p'" do
     ENV["RUBYOPT"] = '-p'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-n'" do
     ENV["RUBYOPT"] = '-n'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-y'" do
     ENV["RUBYOPT"] = '-y'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-c'" do
     ENV["RUBYOPT"] = '-c'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-s'" do
     ENV["RUBYOPT"] = '-s'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-h'" do
     ENV["RUBYOPT"] = '-h'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '--help'" do
     ENV["RUBYOPT"] = '--help'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-l'" do
     ENV["RUBYOPT"] = '-l'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-S'" do
     ENV["RUBYOPT"] = '-S irb'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-e'" do
     ENV["RUBYOPT"] = '-e0'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-i'" do
     ENV["RUBYOPT"] = '-i.bak'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-x'" do
     ENV["RUBYOPT"] = '-x'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-C'" do
     ENV["RUBYOPT"] = '-C'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-X'" do
     ENV["RUBYOPT"] = '-X.'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-F'" do
     ENV["RUBYOPT"] = '-F'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '-0'" do
     ENV["RUBYOPT"] = '-0'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '--copyright'" do
     ENV["RUBYOPT"] = '--copyright'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '--version'" do
     ENV["RUBYOPT"] = '--version'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 
   it "raises a RuntimeError for '--yydebug'" do
     ENV["RUBYOPT"] = '--yydebug'
-    ruby_exe("", args: '2>&1').should =~ /RuntimeError/
+    ruby_exe("", args: '2>&1', exit_status: 1).should =~ /RuntimeError/
   end
 end