diff options
| author | Mike McQuaid | 2017-05-30 09:51:06 +0100 | 
|---|---|---|
| committer | Mike McQuaid | 2017-05-30 09:51:06 +0100 | 
| commit | 28cd0d385606f53609a5464fcb7e176f02a79cd6 (patch) | |
| tree | 6a38abcc3874988a2d16174d62c2ddc0a10497db | |
| parent | 2f97b0ae5507ec90e89077eaf1ee7b4426690067 (diff) | |
| download | brew-28cd0d385606f53609a5464fcb7e176f02a79cd6.tar.bz2 | |
Fix Linux build
Remove `testbottest` formula (this should have lived in the `brew
test-bot` repository from the outset) and make various other changes to
fix the Linux build here.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz | bin | 548 -> 0 bytes | |||
| -rw-r--r-- | Library/Homebrew/test/support/fixtures/testbottest.rb | 14 | 
3 files changed, 5 insertions, 14 deletions
| diff --git a/.travis.yml b/.travis.yml index 1c005422c..81642a2d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,9 @@ matrix:        rvm: 2.0.0  before_install: +  - export HOMEBREW_NO_AUTO_UPDATE=1    - export HOMEBREW_DEVELOPER=1 +  - git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot    - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then        HOMEBREW_REPOSITORY="$(brew --repo)";        sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; @@ -24,7 +26,10 @@ before_install:        sudo rm -rf "$HOMEBREW_REPOSITORY";        sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";      else +      git fetch --unshallow;        export PATH="$PWD/bin:$PATH"; +      rm -rf Library/Taps/homebrew/homebrew-test-bot/.git; +      mv Library/Taps/homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-core;        umask 022;      fi diff --git a/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbzBinary files differ deleted file mode 100644 index 83f7ab1dd..000000000 --- a/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz +++ /dev/null diff --git a/Library/Homebrew/test/support/fixtures/testbottest.rb b/Library/Homebrew/test/support/fixtures/testbottest.rb deleted file mode 100644 index f7695cab5..000000000 --- a/Library/Homebrew/test/support/fixtures/testbottest.rb +++ /dev/null @@ -1,14 +0,0 @@ -class Testbottest < Formula -  desc "Minimal C program and Makefile used for testing Homebrew." -  homepage "https://github.com/Homebrew/brew" -  url "file://#{File.expand_path("..", __FILE__)}/tarballs/testbottest-0.1.tbz" -  sha256 "78b54d8f31585c9773bed12b4aa4ab2ce458ebd044b9406cb24d40aa5107f082" - -  def install -    system "make", "install", "PREFIX=#{prefix}" -  end - -  test do -    assert_equal "testbottest\n", shell_output("#{bin}/testbottest") -  end -end | 
