File tree Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change 94
94
- set -o errexit; source ./ci/extended_lint/06_script.sh
95
95
96
96
- stage : test
97
- name : ' ARM [GOAL: install] [unit tests, no functional tests]'
97
+ name : ' ARM [GOAL: install] [unit tests, functional tests]'
98
+ arch : arm64
98
99
env : >-
99
100
FILE_ENV="./ci/test/00_setup_env_arm.sh"
101
+ QEMU_USER_CMD="" # Can run the tests natively without qemu
100
102
101
103
- stage : test
102
104
name : ' Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]'
Original file line number Diff line number Diff line change 7
7
export LC_ALL=C.UTF-8
8
8
9
9
export HOST=arm-linux-gnueabihf
10
- export QEMU_USER_CMD=" qemu-arm -L /usr/arm-linux-gnueabihf/"
11
- export PACKAGES=" python3 g++-arm-linux-gnueabihf busybox qemu-user"
10
+ # The host arch is unknown, so we run the tests through qemu.
11
+ # If the host is arm and wants to run the tests natively, it can set QEMU_USER_CMD to the empty string.
12
+ export QEMU_USER_CMD=" ${QEMU_USER_CMD: " qemu-arm -L /usr/arm-linux-gnueabihf/" } "
13
+ # We don't know whether the host can run the cross compiled binaries. To run them, either qemu-user or libc6:armhf for
14
+ # the target is required, so install both.
15
+ export DPKG_ADD_ARCH=" armhf"
16
+ export PACKAGES=" python3 g++-arm-linux-gnueabihf busybox qemu-user libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
12
17
export USE_BUSY_BOX=true
13
18
export RUN_UNIT_TESTS=true
14
- export RUN_FUNCTIONAL_TESTS=false
19
+ export RUN_FUNCTIONAL_TESTS=true
15
20
export GOAL=" install"
16
21
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
17
22
# This could be removed once the ABI change warning does not show up by default
Original file line number Diff line number Diff line change 76
76
DOCKER_EXEC echo " Number of CPUs \(nproc\):" \$\( nproc\)
77
77
fi
78
78
79
+ if [ -n " $DPKG_ADD_ARCH " ]; then
80
+ DOCKER_EXEC dpkg --add-architecture " $DPKG_ADD_ARCH "
81
+ fi
79
82
80
83
if [ " $TRAVIS_OS_NAME " != " osx" ]; then
81
84
${CI_RETRY_EXE} DOCKER_EXEC apt-get update
You can’t perform that action at this time.
0 commit comments