aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorAlyssa Ross2016-09-20 14:57:08 +0100
committerAlyssa Ross2016-09-20 15:48:00 +0100
commit869fb0214971f3dbcccbe1915702ffc7e7d69d16 (patch)
tree6387cb0b1eda2faec16e1d3eb82a4971d3691497 /Library/Homebrew/dev-cmd
parent651303f62df934d61dd3c317b84b417537d91d8b (diff)
downloadbrew-869fb0214971f3dbcccbe1915702ffc7e7d69d16.tar.bz2
tests, cask-tests: serialize stdout on CI
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/tests.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index aba2fa3b6..9b15f9f3e 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -41,16 +41,24 @@ module Homebrew
files = Dir["test/test_*.rb"]
files -= Dir["test/test_os_mac_*.rb"] unless OS.mac?
+
+ opts = []
+ opts << "--serialize-stdout" if ENV["CI"]
+
args = []
args << "--trace" if ARGV.include? "--trace"
+
if ARGV.value("only")
ENV["HOMEBREW_TESTS_ONLY"] = "1"
test_name, test_method = ARGV.value("only").split("/", 2)
files = ["test/test_#{test_name}.rb"]
args << "--name=test_#{test_method}" if test_method
end
+
args += ARGV.named.select { |v| v[/^TEST(OPTS)?=/] }
- system "bundle", "exec", "parallel_test", "--", *args, "--", *files
+
+ system "bundle", "exec", "parallel_test", *opts,
+ "--", *args, "--", *files
Homebrew.failed = !$?.success?