diff options
| author | Mike McQuaid | 2017-11-05 14:44:17 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-05 14:44:17 +0000 |
| commit | c3006f0f121b44baa7acb5e2a023dfd96e582e7a (patch) | |
| tree | 2a124af1c7a8a0fd9b27d98e1a9df2c165e18d26 | |
| parent | 2af98133ba9083a9620703be78357a227deaeef6 (diff) | |
| parent | 40af9e6f9f6a670fff42691350851b88e73a3100 (diff) | |
| download | brew-c3006f0f121b44baa7acb5e2a023dfd96e582e7a.tar.bz2 | |
Merge pull request #3424 from MikeMcQuaid/services_spec_leak
spec_helper: fix etc leak.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/spec_helper.rb | 1 |
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", |