From 52eb7a3b5785ae9856ea48051158286f7f424fe2 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Tue, 17 Feb 2015 01:04:34 +0100
Subject: [PATCH] Move cc2538dk travis tests to the arm-aapcs job

It makes sense to test cc2538dk with the toolchain recommended in the README (GNU Tools for ARM Embedded Processors) rather than the one which was being used two years ago (Sourcery G++ Lite)
---
 .travis.yml                                         | 2 +-
 regression-tests/15-compile-arm-apcs-ports/Makefile | 9 ---------
 regression-tests/18-compile-arm-ports/Makefile      | 9 +++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03559d8a5..d4c03b5af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
   - sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386
       libstdc++5:i386 libstdc++6:i386
 
-  ## Install old APCS ARM toolchain for mc1233x, cc2538 and mbxxx
+  ## Install old APCS ARM toolchain for mc1233x and mbxxx
   - if [ ${BUILD_ARCH:-0} = arm-apcs ] ; then
       $WGET https://raw.githubusercontent.com/wiki/malvira/libmc1322x/files/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 &&
       tar xjf arm-2008q3*.tar.bz2 -C /tmp/ &&
diff --git a/regression-tests/15-compile-arm-apcs-ports/Makefile b/regression-tests/15-compile-arm-apcs-ports/Makefile
index 394c11414..e73a9a39f 100644
--- a/regression-tests/15-compile-arm-apcs-ports/Makefile
+++ b/regression-tests/15-compile-arm-apcs-ports/Makefile
@@ -4,19 +4,10 @@ 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 \
-cc2538dk/mqtt-demo/cc2538dk \
 ipv6/multicast/econotag \
-ipv6/multicast/cc2538dk \
 
 TOOLS=
 
diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index 4389c6d86..217b5eef9 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -8,6 +8,15 @@ webserver-ipv6/ev-aducrf101mkxz \
 ipv6/multicast/ev-aducrf101mkxz \
 cc2538dk/sniffer/ev-aducrf101mkxz \
 cc26xx/cc26xx-web-demo/srf06-cc26xx \
+hello-world/cc2538dk \
+ipv6/rpl-border-router/cc2538dk \
+er-rest-example/cc2538dk \
+webserver-ipv6/cc2538dk \
+cc2538dk/cc2538dk \
+cc2538dk/udp-ipv6-echo-server/cc2538dk \
+cc2538dk/sniffer/cc2538dk \
+cc2538dk/mqtt-demo/cc2538dk \
+ipv6/multicast/cc2538dk \
 
 TOOLS=