Merge #9390: travis: make distdir

fad896d gitignore: Wipe line after java comp tool removal (MarcoFalke)
fad632e travis: make distdir (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2016-12-21 11:24:10 +01:00
commit 8b4127fd4e
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 1 additions and 1 deletions

1
.gitignore vendored
View file

@ -56,7 +56,6 @@ src/qt/test/moc*.cpp
*.o *.o
*.o-* *.o-*
*.patch *.patch
.bitcoin
*.a *.a
*.pb.cc *.pb.cc
*.pb.h *.pb.h

View file

@ -60,6 +60,7 @@ script:
- mkdir build && cd build - mkdir build && cd build
- ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - ../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 $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 - 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 make $MAKEJOBS check VERBOSE=1; fi
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi