No need for this helper without in-process spawn

Author: headius

test/jruby/test_command_line_switches.rb

@@ -16,20 +16,16 @@ def test_dash_0_splits_records
   end if IS_JAR_EXECUTION
 
   def test_dash_little_c_checks_syntax
-    with_jruby_shell_spawning do
-      with_temp_script("bad : code") do |s|
-        assert_match(/SyntaxError/, jruby("-c #{s.path} 2>&1"))
-        assert_not_equal 0, $?.exitstatus
-      end
+    with_temp_script("bad : code") do |s|
+      assert_match(/SyntaxError/, jruby("-c #{s.path} 2>&1"))
+      assert_not_equal 0, $?.exitstatus
     end
   end
 
   def test_dash_little_c_checks_syntax_only
-    with_jruby_shell_spawning do
-      with_temp_script(%q{ puts "a" }) do |s|
-        assert_match(/Syntax OK/, jruby(" -c #{s.path} 2>&1").chomp)
-        assert_equal 0, $?.exitstatus
-      end
+    with_temp_script(%q{ puts "a" }) do |s|
+      assert_match(/Syntax OK/, jruby(" -c #{s.path} 2>&1").chomp)
+      assert_equal 0, $?.exitstatus
     end
   end
 
@@ -158,20 +154,16 @@ def test_dash_big_C_error
   end
 
   def test_dash_little_w_turns_warnings_on
-    with_jruby_shell_spawning do
-      assert_match(/warning/, `#{RUBY} -v -e "defined? true" 2>&1`)
-      assert_equal 0, $?.exitstatus
-    end
+    assert_match(/warning/, `#{RUBY} -v -e "defined? true" 2>&1`)
+    assert_equal 0, $?.exitstatus
   end
 
   def test_dash_big_w_sets_warning_level
-    with_jruby_shell_spawning do
-      with_temp_script("defined? true") do |s|
-        assert_equal "", jruby("-W1 #{s.path} 2>&1")
-        assert_equal 0, $?.exitstatus
-        assert_match(/warning/, jruby("-W2 #{s.path} 2>&1"))
-        assert_equal 0, $?.exitstatus
-      end
+    with_temp_script("defined? true") do |s|
+      assert_equal "", jruby("-W1 #{s.path} 2>&1")
+      assert_equal 0, $?.exitstatus
+      assert_match(/warning/, jruby("-W2 #{s.path} 2>&1"))
+      assert_equal 0, $?.exitstatus
     end
   end
 
@@ -259,11 +251,9 @@ def test_with_interesting_file_names
              /test__/, /test_U_D/, /_P_U_S_D/]
 
     names.each_with_index do |name, idx|
-      with_jruby_shell_spawning do
-        with_temp_script('print __FILE__', name) do |s|
-          assert_match rgxes[idx], jruby("#{s.path}")
-          assert_equal 0, $?.exitstatus
-        end
+      with_temp_script('print __FILE__', name) do |s|
+        assert_match rgxes[idx], jruby("#{s.path}")
+        assert_equal 0, $?.exitstatus
       end
     end
   end
@@ -281,21 +271,17 @@ def test_blank_arg_ends_arg_processing
   # JRUBY-4288
   def test_case_insensitive_jruby
     weird_jruby = '"' + File.join([RbConfig::CONFIG['bindir'], 'jRuBy']) << RbConfig::CONFIG['EXEEXT'] + '"'
-    with_jruby_shell_spawning do
-      res = `cmd.exe /c #{weird_jruby} -e "puts 1"`.rstrip
-      assert_equal '1', res
-      assert_equal 0, $?.exitstatus
-    end
+    res = `cmd.exe /c #{weird_jruby} -e "puts 1"`.rstrip
+    assert_equal '1', res
+    assert_equal 0, $?.exitstatus
   end if WINDOWS
 
   # JRUBY-4289
   def test_uppercase_exe
     weird_jruby = '"' + File.join([RbConfig::CONFIG['bindir'], 'jRuBy']) << '.ExE' + '"'
-    with_jruby_shell_spawning do
-      res = `#{weird_jruby} -e "puts 1"`.rstrip
-      assert_equal '1', res
-      assert_equal 0, $?.exitstatus
-    end
+    res = `#{weird_jruby} -e "puts 1"`.rstrip
+    assert_equal '1', res
+    assert_equal 0, $?.exitstatus
   end if WINDOWS
 
   # JRUBY-4290

test/jruby/test_helper.rb

@@ -79,7 +79,7 @@ def jruby(*args)
       args = args[0..-2]
     end
     options.each { |k,v| args.unshift "-J-D#{k}=\"#{v}\"" } unless RUBY =~ /-cp /
-    with_jruby_shell_spawning { sh "#{interpreter(options)} #{args.join(' ')}" }
+    sh "#{interpreter(options)} #{args.join(' ')}"
   end
 
   def jruby(*args)
@@ -98,7 +98,7 @@ def jruby_with_pipe(pipe, *args)
       args = args[0..-2]
     end
     options.each { |k,v| args.unshift "-J-D#{k}=\"#{v}\"" } unless RUBY =~ /-cp /
-    with_jruby_shell_spawning { sh "#{pipe} | #{interpreter(options)} #{args.join(' ')}" }
+    sh "#{pipe} | #{interpreter(options)} #{args.join(' ')}"
   end
 
   def sh(cmd)
@@ -108,14 +108,6 @@ def sh(cmd)
 
   private
 
-  def with_jruby_shell_spawning
-    prev_in_process = JRuby.runtime.instance_config.run_ruby_in_process
-    JRuby.runtime.instance_config.run_ruby_in_process = false
-    yield
-  ensure
-    JRuby.runtime.instance_config.run_ruby_in_process = prev_in_process
-  end
-
   def quiet(&block)
     io = [STDOUT.dup, STDERR.dup]
     STDOUT.reopen DEVNULL

test/jruby/test_load.rb

@@ -264,10 +264,8 @@ def test_load_from_jar_with_symlink_in_path
       begin
         Dir.mkdir 'not_A' unless File.exist? 'not_A'
         File.symlink("not_A", "A") unless File.symlink?('A')
-        with_jruby_shell_spawning do
-          `bin/jruby -e "load File.join('file:', File.join(File.expand_path(File.dirname(File.dirname('#{__FILE__}'))), 'jruby/requireTest-1.0.jar!'), 'A', 'B.rb') ; B"`
-          assert_equal 0, $?
-        end
+        `bin/jruby -e "load File.join('file:', File.join(File.expand_path(File.dirname(File.dirname('#{__FILE__}'))), 'jruby/requireTest-1.0.jar!'), 'A', 'B.rb') ; B"`
+        assert_equal 0, $?
       ensure
         File.delete("A") if File.symlink?('A')
         Dir.rmdir 'not_A' if File.exist? 'not_A'

test/jruby/test_load_compiled_ruby_class_from_classpath.rb

@@ -29,14 +29,11 @@ def setup
 
     # This line means we assume the test is running from the jruby root directory
     @jruby_home = Dir.pwd
-    @in_process = JRuby.runtime.instance_config.run_ruby_in_process
-    JRuby.runtime.instance_config.run_ruby_in_process = false
   end
 
   def teardown
     remove_test_artifacts
     ENV["CLASSPATH"] = @@ENV_CLASSPATH
-    JRuby.runtime.instance_config.run_ruby_in_process = @in_process
   end
 
   def test_loading_compiled_ruby_class_from_classpath