Merge pull request #2607 from MikeMcQuaid/travis-ci-tweaks-2

Travis CI tweaks.

2 files changed, 20 insertions, 12 deletions

diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 48449e98d..dcb41265c 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -49,6 +49,10 @@ module Homebrew
       env: OSX=10.12
       osx_image: xcode8.3
       rvm: system
+      cache:
+        directories:
+          - $HOME/.gem/ruby
+          - Library/Homebrew/vendor/bundle
 
       before_install:
         - export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 72d6143fc..d90326768 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -79,20 +79,24 @@ module Homebrew
         Dir.glob("test/**/*_spec.rb").reject { |p| p =~ %r{^test/vendor/bundle/} }
       end
 
-      opts = []
-
-      if ENV["CI"]
-        opts << "--combine-stderr"
-        opts << "--serialize-stdout"
+      opts = if ENV["CI"]
+        %w[
+          --combine-stderr
+          --serialize-stdout
+        ]
+      else
+        %w[
+          --nice
+        ]
       end
 
-      args = [
-        "--color",
-        "-I", HOMEBREW_LIBRARY_PATH/"test",
-        "--require", "spec_helper",
-        "--format", "progress",
-        "--format", "ParallelTests::RSpec::RuntimeLogger",
-        "--out", "tmp/parallel_runtime_rspec.log"
+      args = ["-I", HOMEBREW_LIBRARY_PATH/"test"]
+      args += %w[
+        --color
+        --require spec_helper
+        --format progress
+        --format ParallelTests::RSpec::RuntimeLogger
+        --out tmp/parallel_runtime_rspec.log
       ]
 
       args << "--seed" << ARGV.next if ARGV.include? "--seed"