Split the collect test into collect and collect-lossy to make each individual

travis build complete faster.

Also changed the armgcc download link to a github location.
This commit is contained in:
Adam Dunkels 2013-03-09 18:43:59 +01:00
parent f5a1ffa90d
commit 49bf7626f1
26 changed files with 3 additions and 1 deletions

View file

@ -10,7 +10,7 @@ before_script:
- "sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 || true" - "sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 || true"
## Install toolchain for mc1233x in care-free way ## Install toolchain for mc1233x in care-free way
- "[ $BUILD_TYPE = compile ] && curl -s \ - "[ $BUILD_TYPE = compile ] && curl -s \
https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \ http://adamdunkels.github.com/contiki-fork/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \
| tar xjf - -C /tmp/ && sudo cp -f -r /tmp/arm-2008q3/* /usr/ && rm -rf /tmp/arm-2008q3 && arm-none-eabi-gcc --version || true" | tar xjf - -C /tmp/ && sudo cp -f -r /tmp/arm-2008q3/* /usr/ && rm -rf /tmp/arm-2008q3 && arm-none-eabi-gcc --version || true"
## Install SDCC from a purpose-built bundle ## Install SDCC from a purpose-built bundle
- "[ $BUILD_TYPE = compile ] && curl -s \ - "[ $BUILD_TYPE = compile ] && curl -s \
@ -40,6 +40,7 @@ env:
## of environment variable defined below ## of environment variable defined below
- BUILD_TYPE='compile' - BUILD_TYPE='compile'
- BUILD_TYPE='collect' MAKE_TARGETS='cooja' - BUILD_TYPE='collect' MAKE_TARGETS='cooja'
- BUILD_TYPE='collect-lossy' MAKE_TARGETS='cooja'
- BUILD_TYPE='rpl' MAKE_TARGETS='cooja' - BUILD_TYPE='rpl' MAKE_TARGETS='cooja'
- BUILD_TYPE='rime' MAKE_TARGETS='cooja' - BUILD_TYPE='rime' MAKE_TARGETS='cooja'
- BUILD_TYPE='ipv6' MAKE_TARGETS='cooja' - BUILD_TYPE='ipv6' MAKE_TARGETS='cooja'

View file

@ -0,0 +1 @@
include ../Makefile.simulation-test