Fixup OSX CI breaks.

Review Request #2241 - Created May 18, 2015 and submitted

Information
John Sirois
pants
jsirois/osx_ci/fix_breaks
1567
2c72194...
Reviewers
pants-reviews
fkorotkov, zundel
Kill now-dead `-e` and `-t` flags in one of the OSX CI shards.

Fixup Distribution to discover its true home dir even if initial
discovery is via the jre `java` executable and add unit tests to
exercise this.  Also fixup both binary and lib_path discovery to
check both JDK and JRE bin and lib paths when the distribution is a JDK.

 .travis.osx.yml                                                |   2 +-
 src/python/pants/java/distribution/distribution.py             |  56 ++++++++---
 tests/python/pants_test/java/distribution/test_distribution.py | 270 ++++++++++++++++++++++++++++----------------------
 tests/python/pants_test/java/test_executor.py                  |   9 +-
 4 files changed, 203 insertions(+), 134 deletions(-)

The OSX CI flag breaks looked like so:
https://travis-ci.org/pantsbuild/pants-for-travis-osx-ci/jobs/62786185

Once fixed, the tools.jar discovery breaks looked like so:
https://travis-ci.org/pantsbuild/pants-for-travis-osx-ci/jobs/62788216

I setup a manual force push to OSX CI with:

$ cp .travis.osx.yml .travis.yml && \
  git commit -am 'Setup a manual OSX CI run for https://github.com/pantsbuild/pants/pull/1567' && \
  git push -f git@github.com:pantsbuild/pants-for-travis-osx-ci.git HEAD:master && \
  git reset --hard HEAD~1

That OSX CI went green here:
https://travis-ci.org/pantsbuild/pants-for-travis-osx-ci/builds/63072248

Linux CI went green here:
https://travis-ci.org/pantsbuild/pants/builds/63076569

Eric Ayers
John Sirois
John Sirois
John Sirois
John Sirois
Review request changed

Status: Closed (submitted)

Eric Ayers
Ship It!
Loading...