admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

dev-cmd/tests: improve parallel args naming.

Browse Source
This commit is contained in:
Mike McQuaid 2019-02-27 14:02:38 +00:00
parent 9f3ae3238d
commit 97958410f4
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/dev-cmd/tests.rb
View File

@ -44,6 +44,7 @@ module Homebrew
ENV.delete("HOMEBREW_NO_GITHUB_API") ENV.delete("HOMEBREW_NO_GITHUB_API")
ENV.delete("HOMEBREW_NO_EMOJI") ENV.delete("HOMEBREW_NO_EMOJI")
ENV.delete("HOMEBREW_DEVELOPER") ENV.delete("HOMEBREW_DEVELOPER")
ENV.delete("HOMEBREW_PRY")
ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat? ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat?
ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?
@ -85,7 +86,7 @@ module Homebrew
Dir.glob("test/**/*_spec.rb") Dir.glob("test/**/*_spec.rb")
end end
opts = if ENV["CI"] parallel_args = if ENV["CI"]
%w[ %w[
--combine-stderr --combine-stderr
--serialize-stdout --serialize-stdout
@ -123,7 +124,7 @@ module Homebrew
puts "Randomized with seed #{seed}" puts "Randomized with seed #{seed}"
if parallel if parallel
system "bundle", "exec", "parallel_rspec", *opts, "--", *bundle_args, "--", *files system "bundle", "exec", "parallel_rspec", *parallel_args, "--", *bundle_args, "--", *files
else else
system "bundle", "exec", "rspec", *bundle_args, "--", *files system "bundle", "exec", "rspec", *bundle_args, "--", *files
end end