From 5e016e4f1b81f8722dedd0e606840d20ca980c65 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Wed, 14 Feb 2018 09:59:29 +0100
Subject: [PATCH] Make toolchain persistent accross runs

---
 .travis.yml                | 1 +
 scripts/run_integration.sh | 2 +-
 scripts/setup_toolchain.sh | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd0a357..f703eca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ sudo: false
 cache:
   directories:
     - $HOME/qemu
+    - $HOME/toolchains
 
 matrix:
   include:
diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index 0882d78..a1f5fa7 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -14,7 +14,7 @@ if [[ -n "${CROSS_COMPILE}" ]]; then
   : "${QEMU_ARCH:?Need to set QEMU_ARCH non-empty}"
   ${SCRIPT_FOLDER}/setup_qemu.sh
   ${SCRIPT_FOLDER}/setup_toolchain.sh
-  export TOOLCHAIN=${HOME}/${TOOLCHAIN_NAME}
+  export TOOLCHAIN=${HOME}/toolchains/${TOOLCHAIN_NAME}
   export PATH=${TOOLCHAIN}/bin:${HOME}/qemu/bin:${PATH}
   export CMAKE_TOOLCHAIN_FILE=cmake/${TARGET}.cmake
   if [[ ! -f ${CMAKE_TOOLCHAIN_FILE} ]]; then
diff --git a/scripts/setup_toolchain.sh b/scripts/setup_toolchain.sh
index 908369e..de20537 100755
--- a/scripts/setup_toolchain.sh
+++ b/scripts/setup_toolchain.sh
@@ -4,7 +4,8 @@ set -e
 : "${TOOLCHAIN_NAME:?Need to set TOOLCHAIN_NAME non-empty}"
 : "${TARGET:?Need to set TARGET non-empty}"
 
-if [[ -d "$HOME/${TOOLCHAIN_NAME}/${TARGET}" ]] ; then
+
+if [[ -d "$HOME/toolchains/${TOOLCHAIN_NAME}/${TARGET}" ]] ; then
   echo "toolchain ${TOOLCHAIN_NAME} ${TARGET} exists!"
   exit 0
 fi
@@ -14,7 +15,9 @@ export ARCHIVE_NAME=${TOOLCHAIN_NAME}.tar.xz
 echo "TOOLCHAIN: $TOOLCHAIN_NAME"
 echo "TARGET   : $TARGET"
 
-cd $HOME
+mkdir -p $HOME/toolchains
+cd $HOME/toolchains
 
 test -f "${ARCHIVE_NAME}" || wget https://releases.linaro.org/components/toolchain/binaries/latest/${TARGET}/${ARCHIVE_NAME}
 tar -xJf ${ARCHIVE_NAME}
+rm ${ARCHIVE_NAME}