diff options
| author | Mike McQuaid | 2016-09-17 10:15:13 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-17 10:15:13 +0100 |
| commit | 10f2bc2deabad58c4f6b80481ccc913faeb85510 (patch) | |
| tree | a3b7be88aaa4a6d0cc07830f6800c3ecb4c0e349 /Library/Homebrew/test | |
| parent | 297eeac0d3e6fbb154bcc43570111777fb73bcfa (diff) | |
| parent | e3609b6fd4001523679562c33064e17d03e1534f (diff) | |
| download | brew-10f2bc2deabad58c4f6b80481ccc913faeb85510.tar.bz2 | |
Merge pull request #973 from MikeMcQuaid/move-repo-links
Move LinkedKegs/PinnedKegs/Locks from Library.
Diffstat (limited to 'Library/Homebrew/test')
| -rw-r--r-- | Library/Homebrew/test/lib/config.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_integration_cmds.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 713bc9c3a..98144d71e 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -24,6 +24,8 @@ HOMEBREW_REPOSITORY = HOMEBREW_PREFIX HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY+"Library" HOMEBREW_CACHE = HOMEBREW_PREFIX.parent+"cache" HOMEBREW_CACHE_FORMULA = HOMEBREW_PREFIX.parent+"formula_cache" +HOMEBREW_LINKED_KEGS = HOMEBREW_PREFIX.parent+"linked" +HOMEBREW_PINNED_KEGS = HOMEBREW_PREFIX.parent+"pinned" HOMEBREW_LOCK_DIR = HOMEBREW_PREFIX.parent+"locks" HOMEBREW_CELLAR = HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_LOGS = HOMEBREW_PREFIX.parent+"logs" diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb index 5b64dfd85..3eef41515 100644 --- a/Library/Homebrew/test/test_integration_cmds.rb +++ b/Library/Homebrew/test/test_integration_cmds.rb @@ -14,6 +14,8 @@ class IntegrationCommandTests < Homebrew::TestCase def teardown coretap = CoreTap.new paths_to_delete = [ + HOMEBREW_LINKED_KEGS, + HOMEBREW_PINNED_KEGS, HOMEBREW_CELLAR.children, HOMEBREW_CACHE.children, HOMEBREW_LOCK_DIR.children, @@ -22,7 +24,6 @@ class IntegrationCommandTests < Homebrew::TestCase HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"share", HOMEBREW_PREFIX/"opt", - HOMEBREW_LINKED_KEGS, HOMEBREW_LIBRARY/"Taps/caskroom", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo", |