summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/merge-simplecov4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov
index b59ff0ae9a0..0d764d2b406 100755
--- a/scripts/merge-simplecov
+++ b/scripts/merge-simplecov
@@ -58,8 +58,6 @@ def merged_result
result
end
-SimpleCov.configure do
- merge_timeout 7200
-end
+require_relative '../spec/simplecov_env'
merged_result.format!