diff options
| author | Mike McQuaid | 2013-07-17 22:08:57 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2013-07-18 09:56:55 -0700 |
| commit | e33d3e1e5ca69b7ea61d0e2ee8f691530146cf1a (patch) | |
| tree | e1a6a6aec3e0542a08a0e2819f317b43164700aa | |
| parent | 1a4bea3a550c94f9804293375b2e99eb4fab1118 (diff) | |
| download | brew-e33d3e1e5ca69b7ea61d0e2ee8f691530146cf1a.tar.bz2 | |
brew-test-bot: only install bottle if created OK.
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index 5ef11db69..070955c8b 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -268,18 +268,18 @@ class Test test "brew audit #{formula}" return unless install_passed test "brew bottle #{formula}", :puts_output_on_success => true - bottle_revision = bottle_new_revision(formula_object) - bottle_filename = bottle_filename(formula_object, bottle_revision) bottle_step = steps.last if bottle_step.passed? and bottle_step.has_output? + bottle_revision = bottle_new_revision(formula_object) + bottle_filename = bottle_filename(formula_object, bottle_revision) bottle_base = bottle_filename.gsub(bottle_suffix(bottle_revision), '') bottle_output = bottle_step.output.gsub /.*(bottle do.*end)/m, '\1' File.open "#{bottle_base}.bottle.rb", 'w' do |file| file.write bottle_output end + test "brew uninstall --force #{formula}" + test "brew install #{bottle_filename}" end - test "brew uninstall --force #{formula}" - test "brew install #{bottle_filename}" test "brew test #{formula}" if formula_object.test_defined? test "brew uninstall --force #{formula}" test "brew uninstall --force #{dependencies}" unless dependencies.empty? |
