Merge pull request #400 from amatsuda/warning

"warning: global variable `$ERROR_INFO' not initialized"
simplecov-ruby · Aug 27, 2015 · 0d85bd0 · 0d85bd0 · xaviershay · Nov 28, 2015
2 parents 76ab9c2 + 8e598ac
commit 0d85bd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -57,6 +57,7 @@ Style/SpecialGlobalVars:
   Exclude:
     - 'spec/deleted_source_spec.rb'
     - 'spec/return_codes_spec.rb'
+    - 'lib/simplecov/defaults.rb'
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

diff --git a/lib/simplecov/defaults.rb b/lib/simplecov/defaults.rb
@@ -48,11 +48,11 @@
   # If we are in a different process than called start, don't interfere.
   next if SimpleCov.pid != Process.pid
 
-  if $ERROR_INFO # was an exception thrown?
+  if $! # was an exception thrown?
     # if it was a SystemExit, use the accompanying status
     # otherwise set a non-zero status representing termination by some other exception
     # (see github issue 41)
-    @exit_status = $ERROR_INFO.is_a?(SystemExit) ? $ERROR_INFO.status : SimpleCov::ExitCodes::EXCEPTION
+    @exit_status = $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
   else
     # Store the exit status of the test run since it goes away after calling the at_exit proc...
     @exit_status = SimpleCov::ExitCodes::SUCCESS