diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-22 03:36:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-22 03:36:59 -0300 |
| commit | 9a1fa3e8f8bcc98635c3ab6a16b59874f32d77fb (patch) | |
| tree | 7d05366ed499927cd7b04243530f3bb0531ac2cb /activesupport/lib/active_support | |
| parent | ede051818a158cd6c4117ef7deb4f87019683ad0 (diff) | |
| parent | 61103ac7b0801201533e2c853957da4d80d81b51 (diff) | |
| download | rails-9a1fa3e8f8bcc98635c3ab6a16b59874f32d77fb.tar.gz rails-9a1fa3e8f8bcc98635c3ab6a16b59874f32d77fb.tar.bz2 rails-9a1fa3e8f8bcc98635c3ab6a16b59874f32d77fb.zip | |
Merge pull request #19819 from gazay/no_fork_issue
MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb index 247df7423b..1de0a19998 100644 --- a/activesupport/lib/active_support/testing/isolation.rb +++ b/activesupport/lib/active_support/testing/isolation.rb @@ -69,17 +69,17 @@ module ActiveSupport else Tempfile.open("isolation") do |tmpfile| env = { - ISOLATION_TEST: self.class.name, - ISOLATION_OUTPUT: tmpfile.path + 'ISOLATION_TEST' => self.class.name, + 'ISOLATION_OUTPUT' => tmpfile.path } load_paths = $-I.map {|p| "-I\"#{File.expand_path(p)}\"" }.join(" ") orig_args = ORIG_ARGV.join(" ") test_opts = "-n#{self.class.name}##{self.name}" - command = "#{Gem.ruby} #{load_paths} #{$0} #{orig_args} #{test_opts}" + command = "#{Gem.ruby} #{load_paths} #{$0} '#{orig_args}' #{test_opts}" # IO.popen lets us pass env in a cross-platform way - child = IO.popen([env, command]) + child = IO.popen(env, command) begin Process.wait(child.pid) |