diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-21 11:24:10 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-21 11:24:41 +0100 |
| commit | 8b4127fd4eb34294ccf4a82651a0b435d6786ddc (patch) | |
| tree | 295ecd7dcb40535df9e5a9ff58be40dbd45cb59a | |
| parent | 03d85f6644ccd78ad390933a60a6aa3a987cab10 (diff) | |
| parent | fad896df19bb917c8121118c944aa9047f105b19 (diff) | |
Merge #9390: travis: make distdir
fad896d gitignore: Wipe line after java comp tool removal (MarcoFalke)
fad632e travis: make distdir (MarcoFalke)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 5dbce8aa7c..8ace3c7123 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ src/qt/test/moc*.cpp *.o *.o-* *.patch -.bitcoin *.a *.pb.cc *.pb.h diff --git a/.travis.yml b/.travis.yml index d201cea732..6570e6571b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ script: - mkdir build && cd build - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) + - make distdir - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi |