fix travis config and make it adapt to the number of CPUs

This commit is contained in:
arvidn 2015-06-25 00:26:22 -04:00
parent 7c7ea4cd90
commit 040a5b7048
1 changed files with 5 additions and 5 deletions

View File

@ -6,8 +6,8 @@ env:
- variant=test_barebones
install:
- if [ $TRAVIS_OS_NAME == linux ]; then cat /proc/cpuinfo ; fi
- if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi
- if [ $TRAVIS_OS_NAME == linux ]; then export cpus=`grep processor -c /proc/cpuinfo` ; else export cpus=2 ; fi
- if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:boost-latest/ppa; sudo apt-get update -qq; fi
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install libboost1.54-all-dev python2.7-dev; fi
- if [ $TRAVIS_OS_NAME == osx ]; then sudo brew install boost boost-build python27-dev; fi
- 'echo "using gcc : : ccache g++ ;" >~/user-config.jam'
@ -22,11 +22,11 @@ cache: ccache
script:
- cd test
- bjam -j2 variant=$variant warnings=off -l900 $CC
- bjam -j $cpus variant=$variant warnings=off -l900 $CC
- cd ../examples
- bjam -j2 variant=$variant warnings=off $CC
- bjam -j $cpus variant=$variant warnings=off $CC
- cd ../bindings/python
- bjam -j2 variant=$variant warnings=off $CC
- bjam -j $cpus variant=$variant warnings=off $CC
- ccache --show-stats
compiler: