Merge pull request #323 from g-oikonomou/smaller-travis-builds

Travis: Multiple Smaller Compile Builds and a Fix

.travis.yml

@@ -9,30 +9,32 @@ before_script:
        http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 \
          | tar xjf - -C /tmp/ && sudo cp -f -r /tmp/msp430/* /usr/local/ && rm -rf /tmp/msp430 && msp430-gcc --version || true"
   - "sudo apt-get -qq install gcc-avr avr-libc || true"
-  - "sudo apt-get -qq install srecord || 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
+
-  - "[ $BUILD_TYPE = compile ] && curl -s \
+  ## Install toolchain for mc1233x, cc2538 and mbxxx in care-free way
+  - "[ ${BUILD_ARCH:-0} = arm ] && curl -s \
        https://raw.github.com/wiki/malvira/libmc1322x/files/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"
+
   ## Install SDCC from a purpose-built bundle
-  - "[ $BUILD_TYPE = compile ] && curl -s \
+  - "[ ${BUILD_ARCH:-0} = 8051 ] && curl -s \
        https://raw.github.com/wiki/g-oikonomou/contiki-sensinode/files/sdcc.tar.gz \
          | tar xzf - -C /tmp/ && sudo cp -f -r /tmp/sdcc/* /usr/local/ && rm -rf /tmp/sdcc && sdcc --version || true"
+  - "[ ${BUILD_ARCH:-0} = 8051 ] && sudo apt-get -qq install srecord || true"
 
   ## Compile cooja.jar only when it's going to be needed
-  - "[ ! $BUILD_TYPE = compile ] && java -version && ant -q -f tools/cooja/build.xml jar || true"
+  - "[ ${BUILD_CATEGORY:-sim} = sim ] && java -version && ant -q -f tools/cooja/build.xml jar || true"
 
   ## IMPORTANT: The commands here have to end with `|| true`,
   ## because it would make the test fail if BUILD_TYPE test fails
 
 script:
-  ## The makefile called `.travis.mk` handles most of generic logic
+  ## regression-tests/Makefile handles most of generic logic
   - "make -C regression-tests/??-$BUILD_TYPE RUNALL=true summary"
 
 after_script:
   ## Print cooja test logs
-  - "tail regression-tests/??-$BUILD_TYPE/*.testlog"
+  - "[ ${BUILD_CATEGORY:-sim} = sim ] && tail regression-tests/??-$BUILD_TYPE/*.testlog"
   ## Print a basic summary 
   - "echo 'Summary:'; cat regression-tests/??-$BUILD_TYPE/summary"
   - "FAILS=`grep -c -i 'fail' regression-tests/??-$BUILD_TYPE/summary`"
@@ -43,7 +45,7 @@ after_script:
 env:
   ## This magically kick-off parallel jobs for each of the for the sets
   ## of environment variable defined below
-  - BUILD_TYPE='compile'
+  - BUILD_TYPE='compile-base' BUILD_CATEGORY='compile'
   - BUILD_TYPE='collect'
   - BUILD_TYPE='collect-lossy'
   - BUILD_TYPE='rpl'
@@ -57,3 +59,5 @@ env:
   - BUILD_TYPE='elfloader'
   - BUILD_TYPE='ipv4'
   - BUILD_TYPE='ipv6-apps'
+  - BUILD_TYPE='compile-8051-ports' BUILD_CATEGORY='compile' BUILD_ARCH='8051'
+  - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm'

regression-tests/01-compile-base/Makefile

@@ -3,25 +3,17 @@ TOOLSDIR=../../tools
 
 EXAMPLES = \
 hello-world/avr-raven \
-hello-world/econotag \
 hello-world/esb \
 hello-world/exp5438 \
-hello-world/mbxxx \
 hello-world/micaz \
 hello-world/minimal-net \
 hello-world/native \
 hello-world/sky \
 hello-world/wismote \
 hello-world/z1 \
-hello-world/sensinode \
-hello-world/cc2530dk \
-hello-world/cc2538dk \
 eeprom-test/native \
-ipv6/rpl-border-router/econotag \
-ipv6/rpl-border-router/cc2538dk \
 collect/sky \
 er-rest-example/sky \
-er-rest-example/econotag \
 example-shell/native \
 netperf/sky \
 powertrace/sky \
@@ -38,21 +30,9 @@ sky-shell-webserver/sky \
 telnet-server/minimal-net \
 webserver/minimal-net \
 webserver-ipv6/sky \
-webserver-ipv6/econotag \
 wget/minimal-net \
 z1/z1 \
 settings-example/avr-raven \
-sensinode/sensinode \
-sensinode/border-router/sensinode \
-sensinode/udp-ipv6/sensinode \
-sensinode/sniffer/sensinode \
-cc2530dk/cc2530dk \
-cc2530dk/border-router/cc2530dk \
-cc2530dk/udp-ipv6/cc2530dk \
-cc2530dk/sniffer/cc2530dk \
-cc2538dk/cc2538dk \
-cc2538dk/udp-ipv6-echo-server/cc2538dk \
-cc2538dk/sniffer/cc2530dk \
 
 TOOLS=
 

regression-tests/14-compile-8051-ports/Makefile

@@ -0,0 +1,18 @@
+EXAMPLESDIR=../../examples
+TOOLSDIR=../../tools
+
+EXAMPLES = \
+hello-world/sensinode \
+hello-world/cc2530dk \
+sensinode/sensinode \
+sensinode/border-router/sensinode \
+sensinode/udp-ipv6/sensinode \
+sensinode/sniffer/sensinode \
+cc2530dk/cc2530dk \
+cc2530dk/border-router/cc2530dk \
+cc2530dk/udp-ipv6/cc2530dk \
+cc2530dk/sniffer/cc2530dk \
+
+TOOLS=
+
+include ../Makefile.compile-test

regression-tests/15-compile-arm-ports/Makefile

@@ -0,0 +1,20 @@
+EXAMPLESDIR=../../examples
+TOOLSDIR=../../tools
+
+EXAMPLES = \
+hello-world/econotag \
+hello-world/mbxxx \
+hello-world/cc2538dk \
+ipv6/rpl-border-router/econotag \
+ipv6/rpl-border-router/cc2538dk \
+er-rest-example/econotag \
+er-rest-example/cc2538dk \
+webserver-ipv6/econotag \
+webserver-ipv6/cc2538dk \
+cc2538dk/cc2538dk \
+cc2538dk/udp-ipv6-echo-server/cc2538dk \
+cc2538dk/sniffer/cc2538dk \
+
+TOOLS=
+
+include ../Makefile.compile-test