Revert "Temporarily disable Travis CI tests against libtorrent 1.0.x until #1878 is resolved."

This reverts commit 7029f4dcd2.
This commit is contained in:
sledgehammer999 2014-11-26 01:39:17 +02:00
parent 89726d4566
commit ed829bc93a

View File

@ -9,8 +9,8 @@ env:
# use libtorrent 0.16.X from RC_0_16 svn branch # use libtorrent 0.16.X from RC_0_16 svn branch
- lt_source=from_svnRC_0_16 gui=true - lt_source=from_svnRC_0_16 gui=true
- lt_source=from_svnRC_0_16 gui=false - lt_source=from_svnRC_0_16 gui=false
#- lt_source=from_svnRC_1_0 gui=true - lt_source=from_svnRC_1_0 gui=true
#- lt_source=from_svnRC_1_0 gui=false - lt_source=from_svnRC_1_0 gui=false
branches: branches:
except: except:
@ -49,7 +49,7 @@ before_install:
install: install:
#- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi #- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
- if [[ "$lt_source" == "from_svnRC_0_16" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi - if [[ "$lt_source" == "from_svnRC_0_16" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
#- if [[ "$lt_source" == "from_svnRC_1_0" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_1_0 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi - if [[ "$lt_source" == "from_svnRC_1_0" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_1_0 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
script: script:
- ./bootstrap.sh - ./bootstrap.sh