diff --git a/.travis.yml b/.travis.yml index 7a0b9f28b..d79c02f93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ language: cpp sudo: required +dist: trusty before_install: - .travis/before_install.sh @@ -44,20 +45,20 @@ matrix: - env: BUILD_TARGET="scan-build" compiler: clang os: linux - - env: BUILD_TARGET="posix-distcheck" DISTCHECK_CONFIGURE_FLAGS="--with-examples=posix --enable-cli --enable-ncp --with-tests=all" VERBOSE=1 - compiler: gcc - os: linux - - env: NODE_TYPE=ncp-sim BUILD_TARGET="posix-distcheck" DISTCHECK_CONFIGURE_FLAGS="--with-examples=posix --enable-cli --enable-ncp=uart --with-tests=all" VERBOSE=1 BuildJobs=10 + - env: BUILD_TARGET="cc2538" compiler: gcc os: linux - env: BUILD_TARGET="posix" compiler: clang os: linux - - env: BUILD_TARGET="posix-32-bit" + - env: BUILD_TARGET="posix-distcheck" VERBOSE=1 compiler: gcc os: linux - - env: BUILD_TARGET="cc2538" + - env: BUILD_TARGET="posix-32-bit" VERBOSE=1 + compiler: gcc + os: linux + - env: BUILD_TARGET="posix-ncp" VERBOSE=1 compiler: gcc os: linux allow_failures: - - env: NODE_TYPE=ncp-sim BUILD_TARGET="posix-distcheck" DISTCHECK_CONFIGURE_FLAGS="--with-examples=posix --enable-cli --enable-ncp=uart --with-tests=all" VERBOSE=1 BuildJobs=10 + - env: BUILD_TARGET="posix-ncp" VERBOSE=1 diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 5b11e1c81..59e330fca 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -37,8 +37,27 @@ set -x cd /tmp || die [ $TRAVIS_OS_NAME != linux ] || { - sudo apt-get update - sudo apt-get install python-pexpect || die + sudo apt-get update || die + + sudo -H pip install --upgrade pip || die + pip install --upgrade pip || die + + sudo -H pip install pexpect || die + pip install pexpect || die + + [ $BUILD_TARGET != pretty-check ] || { + wget http://jaist.dl.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz || die + tar xzvf astyle_2.05.1_linux.tar.gz || die + cd astyle/build/gcc || die + LDFLAGS=" " make || die + cd ../../.. + export PATH=/tmp/astyle/build/gcc/bin:$PATH || die + astyle --version || die + } + + [ $BUILD_TARGET != scan-build ] || { + sudo apt-get install clang || die + } [ $BUILD_TARGET != cc2538 ] || { sudo apt-get install lib32z1 || die @@ -48,19 +67,15 @@ cd /tmp || die arm-none-eabi-gcc --version || die } - [ $BUILD_TARGET != scan-build ] || { - sudo apt-get install clang || die - } - [ $BUILD_TARGET != posix-32-bit ] || { sudo apt-get install g++-multilib || die } - [ $NODE_TYPE != ncp-sim ] || { - sudo easy_install pip || die - sudo pip install blessed || die - sudo pip install ipaddress || die - sudo pip install scapy || die + [ $BUILD_TARGET != posix-ncp ] || { + pip install blessed || die + pip install ipaddress || die + pip install scapy || die + pip install pyserial || die } } @@ -74,13 +89,3 @@ cd /tmp || die arm-none-eabi-gcc --version || die } } - -[ $BUILD_TARGET != pretty-check ] || { - wget http://jaist.dl.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz || die - tar xzvf astyle_2.05.1_linux.tar.gz || die - cd astyle/build/gcc || die - LDFLAGS=" " make || die - cd ../../.. - export PATH=/tmp/astyle/build/gcc/bin:$PATH || die - astyle --version || die -} diff --git a/.travis/script.sh b/.travis/script.sh index 0194bab99..adcb1d0cb 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -42,16 +42,9 @@ set -x make pretty-check || die } -[ $BUILD_TARGET != posix-distcheck ] || { - make -f examples/Makefile-posix distcheck || die -} - -[ $BUILD_TARGET != posix ] || { - make -f examples/Makefile-posix || die -} - -[ $BUILD_TARGET != posix-32-bit ] || { - CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 make -f examples/Makefile-posix || die +[ $BUILD_TARGET != scan-build ] || { + ./configure --with-examples=posix --enable-cli + scan-build --status-bugs -v make } [ $BUILD_TARGET != cc2538 ] || { @@ -61,7 +54,18 @@ set -x arm-none-eabi-size output/bin/arm-none-eabi-ot-ncp || die } -[ $BUILD_TARGET != scan-build ] || { - ./configure --with-examples=posix --enable-cli - scan-build --status-bugs -v make +[ $BUILD_TARGET != posix ] || { + make -f examples/Makefile-posix || die +} + +[ $BUILD_TARGET != posix-distcheck ] || { + BuildJobs=10 make -f examples/Makefile-posix distcheck || die +} + +[ $BUILD_TARGET != posix-32-bit ] || { + CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 BuildJobs=10 make -f examples/Makefile-posix check || die +} + +[ $BUILD_TARGET != posix-ncp ] || { + NODE_TYPE=ncp-sim BuildJobs=10 make -f examples/Makefile-posix check || die }