From b5f37e856cd2523a342f17fa2b9873b1f7f62e2e Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Sat, 5 Jul 2014 21:40:01 -0400 Subject: [PATCH] Rename travis "arm" BUILD_ARCH to "arm-apcs". These platforms are built with an old ARM compiler that supports the deprecated APCS standard. --- .travis.yml | 6 +++--- .../Makefile | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename regression-tests/{15-compile-arm-ports => 15-compile-arm-apcs-ports}/Makefile (100%) diff --git a/.travis.yml b/.travis.yml index c11cea9fb..f50de9382 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ before_script: - sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 - ## Install toolchain for mc1233x, cc2538 and mbxxx in care-free way - - if [ ${BUILD_ARCH:-0} = arm ] ; then + ## Install old APCS ARM toolchain for mc1233x, cc2538 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/ && sudo cp -f -r /tmp/arm-2008q3/* /usr/ && @@ -93,6 +93,6 @@ env: # - 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' + - BUILD_TYPE='compile-arm-apcs-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-apcs' - BUILD_TYPE='compile-6502-ports' BUILD_CATEGORY='compile' BUILD_ARCH='6502' - BUILD_TYPE='slip-radio' MAKE_TARGETS='cooja' diff --git a/regression-tests/15-compile-arm-ports/Makefile b/regression-tests/15-compile-arm-apcs-ports/Makefile similarity index 100% rename from regression-tests/15-compile-arm-ports/Makefile rename to regression-tests/15-compile-arm-apcs-ports/Makefile