Skip to content

Fix issue #64 #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2013
Merged

Fix issue #64 #185

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f3b4c7
Lock results file while doing merge.
jshraibman-mdsol Dec 30, 2012
b27a28a
Update Changelog
jshraibman-mdsol Dec 30, 2012
fd6c621
Detect when being run inside parallel_tests (Issue #64)
jshraibman-mdsol Jan 7, 2013
10186bc
Update Changelog
jshraibman-mdsol Jan 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Detect when being run inside parallel_tests (Issue #64)
  • Loading branch information
@jshraibman-mdsol
jshraibman-mdsol committed Jan 7, 2013
commit fd6c621c891ad4c6ab74f0654d8c88f155ca62c2
11 changes: 10 additions & 1 deletion lib/simplecov/command_guesser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,19 @@ class << self
attr_accessor :original_run_command

def guess
from_command_line_options || from_defined_constants
from_env || from_command_line_options || from_defined_constants
end

private

def from_env
# If being run from inside parallel_tests set the command name according to the process number
if ENV['PARALLEL_TEST_GROUPS'] && ENV['TEST_ENV_NUMBER']
number = ENV['TEST_ENV_NUMBER']
number = '1' if number == ''
"(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
end
end

def from_command_line_options
case original_run_command
Expand Down