diff options
| author | Markus Reiter | 2016-10-30 01:41:10 +0200 |
|---|---|---|
| committer | GitHub | 2016-10-30 01:41:10 +0200 |
| commit | 5e44184b35dcc099a7a2bb19c42ee48bb3d4e247 (patch) | |
| tree | 4e46e424dfb8f744d97ec70dee257ae6010d5f10 /Library/Homebrew/cask | |
| parent | 9ab38dd751b306ff23fc39f5dca12a24eb1206fc (diff) | |
| parent | a9746934fd255072aa2a5768dfe2d2889cd21c85 (diff) | |
| download | brew-5e44184b35dcc099a7a2bb19c42ee48bb3d4e247.tar.bz2 | |
Merge pull request #1400 from reitermarkus/move-bundle-path
Move `test/vendor/bundle` to `vendor/bundle`.
Diffstat (limited to 'Library/Homebrew/cask')
| -rw-r--r-- | Library/Homebrew/cask/Gemfile.lock | 2 | ||||
| -rwxr-xr-x | Library/Homebrew/cask/cmd/brew-cask-tests.rb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/cask/Gemfile.lock b/Library/Homebrew/cask/Gemfile.lock index fac536aa5..4bdf2d0f6 100644 --- a/Library/Homebrew/cask/Gemfile.lock +++ b/Library/Homebrew/cask/Gemfile.lock @@ -26,7 +26,7 @@ GEM metaclass (0.0.4) method_source (0.8.2) minitest (5.9.1) - minitest-reporters (1.1.11) + minitest-reporters (1.1.12) ansi builder minitest (>= 5.0) diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb index 4840ab451..3126490e3 100755 --- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb +++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb @@ -1,5 +1,8 @@ require "English" +ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/cask/Gemfile" +ENV["BUNDLE_PATH"] = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle" + def run_tests(executable, files, args = []) opts = [] opts << "--serialize-stdout" if ENV["CI"] @@ -7,7 +10,7 @@ def run_tests(executable, files, args = []) system "bundle", "exec", executable, *opts, "--", *args, "--", *files end -repo_root = Pathname(__FILE__).realpath.parent.parent +repo_root = Pathname.new(__FILE__).realpath.parent.parent repo_root.cd do ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1" @@ -15,7 +18,7 @@ repo_root.cd do Homebrew.install_gem_setup_path! "bundler" unless quiet_system("bundle", "check") - system "bundle", "install", "--path", "vendor/bundle" + system "bundle", "install" end rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest") |