Merge pull request #1100 from MikeMcQuaid/test-bot-etc-var1.0.3

test-bot: cleanup etc/var after each build.

1 files changed, 5 insertions, 5 deletions

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index ba78cdb59..c1a4d99b7 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -744,7 +744,7 @@ module Homebrew
       end
     end
 
-    def cleanup_git
+    def cleanup_shared
       git "gc", "--auto"
       test "git", "clean", "-ffdx", "--exclude=Library/Taps"
 
@@ -754,8 +754,8 @@ module Homebrew
         safe_system "brew", "untap", tap
       end
 
-      Formula.installed.each do |formula|
-        safe_system "brew", "uninstall", "--force", formula
+      Dir.glob("#{HOMEBREW_PREFIX}/{Cellar,etc,var}/**/*").each do |file|
+        FileUtils.rm_rf file
       end
       safe_system "brew", "prune"
 
@@ -787,7 +787,7 @@ module Homebrew
         git "reset", "--hard", "origin/master"
       end
 
-      cleanup_git
+      cleanup_shared
 
       pr_locks = "#{@repository}/.git/refs/remotes/*/pr/*/*.lock"
       Dir.glob(pr_locks) { |lock| FileUtils.rm_rf lock }
@@ -808,7 +808,7 @@ module Homebrew
         git "stash", "pop"
         test "brew", "cleanup", "--prune=7"
 
-        cleanup_git
+        cleanup_shared
 
         if ARGV.include? "--local"
           FileUtils.rm_rf ENV["HOMEBREW_HOME"]