From fafa064d2a8dbe24303545ab582ec84cde52ab5b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 10 Oct 2019 19:03:51 -0400
Subject: ci: Remove ccache requirement on the host

ccache is only needed to create the cache dir on the host, if it didn't
already exist. The same can be achieved with mkdir, so just use that
instead.
---
 .cirrus.yml           | 2 --
 ci/README.md          | 2 +-
 ci/test/04_install.sh | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 9464ec1685..517cd93585 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -45,8 +45,6 @@ task:
     folder: "/tmp/ccache_dir"
   depends_built_cache:
     folder: "/tmp/cirrus-ci-build/depends/built"
-  depends_sdk_cache:
-    folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
   install_script:
     - apt-get update
     - apt-get -y install git bash ccache
diff --git a/ci/README.md b/ci/README.md
index 16c481158f..fb1cd7460b 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -12,7 +12,7 @@ To allow for a wide range of tested environments, but also ensure reproducibilit
 requires `docker` to be installed. To install all requirements on Ubuntu, run
 
 ```
-sudo apt install docker.io ccache bash git
+sudo apt install docker.io bash git
 ```
 
 To run the default test stage,
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index d0831a4c13..df07b8fe5c 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -33,7 +33,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
 fi
 
 mkdir -p "${BASE_SCRATCH_DIR}"
-ccache echo "Creating ccache dir if it didn't already exist"
+mkdir -p "${CCACHE_DIR}"
 
 if [ ! -d ${DIR_QA_ASSETS} ]; then
   git clone https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}
-- 
cgit v1.2.3


From facc0da63a8fa4bd6fc2782cbe92eb9f920f2256 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 10 Oct 2019 19:04:49 -0400
Subject: travis: Run unit and functional tests on native arm

---
 .travis.yml                 |  4 +++-
 ci/test/00_setup_env_arm.sh | 11 ++++++++---
 ci/test/04_install.sh       |  3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a14ddf34c..8e090bb773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,9 +94,11 @@ jobs:
         - set -o errexit; source ./ci/extended_lint/06_script.sh
 
     - stage: test
-      name: 'ARM  [GOAL: install]  [unit tests, no functional tests]'
+      name: 'ARM  [GOAL: install]  [unit tests, functional tests]'
+      arch: arm64
       env: >-
         FILE_ENV="./ci/test/00_setup_env_arm.sh"
+        QEMU_USER_CMD=""  # Can run the tests natively without qemu
 
     - stage: test
       name: 'Win64  [GOAL: deploy]  [unit tests, no gui, no functional tests]'
diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh
index 9335f0b337..6e2542584c 100644
--- a/ci/test/00_setup_env_arm.sh
+++ b/ci/test/00_setup_env_arm.sh
@@ -7,11 +7,16 @@
 export LC_ALL=C.UTF-8
 
 export HOST=arm-linux-gnueabihf
-export QEMU_USER_CMD="qemu-arm -L /usr/arm-linux-gnueabihf/"
-export PACKAGES="python3 g++-arm-linux-gnueabihf busybox qemu-user"
+# The host arch is unknown, so we run the tests through qemu.
+# If the host is arm and wants to run the tests natively, it can set QEMU_USER_CMD to the empty string.
+export QEMU_USER_CMD="${QEMU_USER_CMD:"qemu-arm -L /usr/arm-linux-gnueabihf/"}"
+# We don't know whether the host can run the cross compiled binaries. To run them, either qemu-user or libc6:armhf for
+# the target is required, so install both.
+export DPKG_ADD_ARCH="armhf"
+export PACKAGES="python3 g++-arm-linux-gnueabihf busybox qemu-user libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
 export USE_BUSY_BOX=true
 export RUN_UNIT_TESTS=true
-export RUN_FUNCTIONAL_TESTS=false
+export RUN_FUNCTIONAL_TESTS=true
 export GOAL="install"
 # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
 # This could be removed once the ABI change warning does not show up by default
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index df07b8fe5c..271ae82e5c 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -76,6 +76,9 @@ else
   DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
 fi
 
+if [ -n "$DPKG_ADD_ARCH" ]; then
+  DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
+fi
 
 if [ "$TRAVIS_OS_NAME" != "osx" ]; then
   ${CI_RETRY_EXE} DOCKER_EXEC apt-get update
-- 
cgit v1.2.3