Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

JRuby specs need to be able to pass args to in_sub_process #152

Merged
merged 1 commit into from
Jan 7, 2015

Conversation

bf4
Copy link
Contributor

@bf4 bf4 commented Jan 7, 2015

Extracted from #134

@bf4 bf4 force-pushed the fix_sub_process_on_jruby branch 2 times, most recently from 514bebe to a9a4766 Compare January 7, 2015 05:30
@@ -1,7 +1,8 @@
module RSpec
module Support
module InSubProcess
if Process.respond_to?(:fork) && !(RUBY_PLATFORM == 'java' && RUBY_VERSION == '1.8.7')
if Process.respond_to?(:fork) && !(Ruby.jruby? && RUBY_VERSION == '1.8.7')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@myronmarston
Copy link
Member

The stuff I added :+1 to looks good to merge. I think the other things are you trying to get the build passing against the current travis JRuby and we should remove that before merging? If so, I'll be glad to merge this once that's been removed.

@bf4
Copy link
Contributor Author

bf4 commented Jan 7, 2015

Ok, removing a9a4766 and 74e9bf6 per #152 (diff)

@bf4 bf4 force-pushed the fix_sub_process_on_jruby branch from 74e9bf6 to b4b191e Compare January 7, 2015 06:22
@myronmarston
Copy link
Member

Cool, I'll merge when appveyor goes green.

myronmarston added a commit that referenced this pull request Jan 7, 2015
JRuby specs need to be able to pass args to in_sub_process
@myronmarston myronmarston merged commit 2f8cbe2 into rspec:master Jan 7, 2015
@myronmarston
Copy link
Member

Merged :). Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants