From 97958410f453eca9332330a873947e64d4d90f8d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 27 Feb 2019 14:02:38 +0000 Subject: [PATCH] dev-cmd/tests: improve parallel args naming. --- Library/Homebrew/dev-cmd/tests.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index dcc19badd3..4b9363c0c2 100644 --- a/Library/Homebrew/dev-cmd/tests.rb +++ b/Library/Homebrew/dev-cmd/tests.rb @@ -44,6 +44,7 @@ module Homebrew ENV.delete("HOMEBREW_NO_GITHUB_API") ENV.delete("HOMEBREW_NO_EMOJI") ENV.delete("HOMEBREW_DEVELOPER") + ENV.delete("HOMEBREW_PRY") ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? @@ -85,7 +86,7 @@ module Homebrew Dir.glob("test/**/*_spec.rb") end - opts = if ENV["CI"] + parallel_args = if ENV["CI"] %w[ --combine-stderr --serialize-stdout @@ -123,7 +124,7 @@ module Homebrew puts "Randomized with seed #{seed}" if parallel - system "bundle", "exec", "parallel_rspec", *opts, "--", *bundle_args, "--", *files + system "bundle", "exec", "parallel_rspec", *parallel_args, "--", *bundle_args, "--", *files else system "bundle", "exec", "rspec", *bundle_args, "--", *files end