aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--Library/Homebrew/test/spec_helper.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 670e69ad0..37944df57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: ruby
+rvm: system
cache:
directories:
- $HOME/.gem/ruby
@@ -12,14 +13,13 @@ matrix:
include:
- os: osx
osx_image: xcode9
- rvm: system
- os: linux
sudo: false
- rvm: 2.3.3
before_install:
- export HOMEBREW_NO_AUTO_UPDATE=1
- export HOMEBREW_DEVELOPER=1
+ - export HOMEBREW_FORCE_VENDOR_RUBY=1
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
HOMEBREW_REPOSITORY="$(brew --repo)";
sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps";
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index c40a72fcc..08766ea37 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -117,6 +117,7 @@ RSpec.configure do |config|
HOMEBREW_PINNED_KEGS,
HOMEBREW_PREFIX/".git",
HOMEBREW_PREFIX/"bin",
+ HOMEBREW_PREFIX/"etc",
HOMEBREW_PREFIX/"share",
HOMEBREW_PREFIX/"opt",
HOMEBREW_PREFIX/"Caskroom",