From 2d1c8b4de4aabd638fb78456044be602adfaddea Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 20 Mar 2015 16:59:21 +0000 Subject: [PATCH] test-bot: don't run readall on <=10.8. The Ruby 1.8 implementation seems to be really flaky, unfortunately. --- Library/Homebrew/cmd/readall.rb | 2 +- Library/Homebrew/cmd/test-bot.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/readall.rb b/Library/Homebrew/cmd/readall.rb index 7bb921b885..440709ec21 100644 --- a/Library/Homebrew/cmd/readall.rb +++ b/Library/Homebrew/cmd/readall.rb @@ -22,7 +22,7 @@ module Homebrew while rb = ruby_files.pop(true) nostdout { failed = true unless system "ruby", "-c", "-w", rb } end - rescue ThreadError, IOError # ignore empty queue error + rescue ThreadError # ignore empty queue error end end end diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 88191b5bc2..e6d81e2aa7 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -505,7 +505,9 @@ module Homebrew def homebrew @category = __method__ test "brew", "tests" - test "brew", "readall", "--syntax" + readall_args = [] + readall_args << "--syntax" if MacOS.version >= :mavericks + test "brew", "readall", *readall_args end def cleanup_before