aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/test/lib/integration_mocks.rb8
-rw-r--r--Library/Homebrew/test/test_integration_cmds.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/test/lib/integration_mocks.rb b/Library/Homebrew/test/lib/integration_mocks.rb
index 322163a8e..6effb0cde 100644
--- a/Library/Homebrew/test/lib/integration_mocks.rb
+++ b/Library/Homebrew/test/lib/integration_mocks.rb
@@ -6,4 +6,12 @@ module Homebrew
end
end
end
+
+ def exec(*args)
+ if ENV["HOMEBREW_TESTS_COVERAGE"] && ENV["HOMEBREW_INTEGRATION_TEST"]
+ # Ensure we get coverage results before replacing the current process.
+ SimpleCov.result
+ end
+ Kernel.exec(*args)
+ end
end
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index a9f6517f8..c6a4702c6 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -28,7 +28,6 @@ class IntegrationCommandTests < Homebrew::TestCase
-W0
-I#{HOMEBREW_LIBRARY_PATH}/test/lib
-rconfig
- -rintegration_mocks
]
if ENV["HOMEBREW_TESTS_COVERAGE"]
# This is needed only because we currently use a patched version of
@@ -38,6 +37,7 @@ class IntegrationCommandTests < Homebrew::TestCase
cmd_args << "-rbundler/setup"
cmd_args << "-rsimplecov"
end
+ cmd_args << "-rintegration_mocks"
cmd_args << (HOMEBREW_LIBRARY_PATH/"../brew.rb").resolved_path.to_s
cmd_args += args
Bundler.with_original_env do