premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #100 from arvidn/travis-update 

build fewer combinations but include c++98 as one test
This commit is contained in:
Arvid Norberg 2015-08-20 09:32:53 +02:00
parent 8cf8e65861 f39755a863
commit e59db1758b
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.yml
View File

@ -5,13 +5,11 @@ os:
- osx - osx
env: env:
- variant=test_debug - variant=test_debug cc=gcc-cpp11 sim=1
- variant=test_release - variant=test_debug cc=clang-cpp11 sim=0
- variant=test_barebones - variant=test_debug cc=gcc-cpp98 sim=0
- variant=test_release cc=gcc-cpp11 sim=0
compiler: - variant=test_barebones cc=gcc-cpp11 sim=0
- gcc
- clang
git: git:
submodules: false submodules: false
@ -39,8 +37,10 @@ before_install:
- git submodule update --init --recursive - git submodule update --init --recursive
install: install:
- 'echo "using gcc : : ccache g++-4.8 : <cxxflags>-std=c++11 ;" > ~/user-config.jam' - 'echo "using gcc : cpp11 : ccache g++-4.8 : <cxxflags>-std=c++11 ;" > ~/user-config.jam'
- 'echo "using clang : : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam' - 'echo "using gcc : cpp98 : ccache g++-4.8 : <cxxflags>-std=c++98 ;" >> ~/user-config.jam'
- 'echo "using clang : cpp11 : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
- 'echo "using clang : cpp98 : ccache clang++ : <cxxflags>-std=c++98 ;" >> ~/user-config.jam'
- 'echo "using python : 2.7 ;" >> ~/user-config.jam' - 'echo "using python : 2.7 ;" >> ~/user-config.jam'
- ccache -V && ccache --show-stats && ccache --zero-stats - ccache -V && ccache --show-stats && ccache --zero-stats
@ -52,7 +52,7 @@ script:
- cd ../bindings/python - cd ../bindings/python
- bjam --hash -j3 variant=$variant warnings=off $CC stage_module - bjam --hash -j3 variant=$variant warnings=off $CC stage_module
- LD_LIBRARY_PATH=. python test.py - LD_LIBRARY_PATH=. python test.py
- if [ $variant == "test_debug" ]; then - if [ $sim ]; then
cd ../../simulation; cd ../../simulation;
bjam --hash -j3 crypto=built-in warnings=off $CC; bjam --hash -j3 crypto=built-in warnings=off $CC;
fi fi

1
Jamfile
View File

@ -296,7 +296,6 @@ rule warnings ( properties * )
result += <cflags>-Wparentheses ; result += <cflags>-Wparentheses ;
result += <cflags>-Wvla ; result += <cflags>-Wvla ;
result += <cflags>-Wc++11-compat ; result += <cflags>-Wc++11-compat ;
result += <cflags>-Wc++14-compat ;
result += <cflags>-Wno-format-zero-length ; result += <cflags>-Wno-format-zero-length ;