Skip to content

Commit fa8a60b

Browse files
author
MarcoFalke
committed
ci: Run non-cross-compile builds natively
1 parent fa56bcb commit fa8a60b

8 files changed

+10
-12
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
dist: xenial
2929
os: linux
3030
language: minimal
31+
arch: amd64
3132
cache:
3233
ccache: true
3334
directories:
@@ -114,33 +115,33 @@ jobs:
114115
- stage: test
115116
name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]'
116117
env: >-
117-
FILE_ENV="./ci/test/00_setup_env_amd64_qt5.sh"
118+
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
118119
119120
- stage: test
120121
name: 'x86_64 Linux [GOAL: install] [trusty] [no functional tests, no depends, only system libs]'
121122
env: >-
122-
FILE_ENV="./ci/test/00_setup_env_amd64_trusty.sh"
123+
FILE_ENV="./ci/test/00_setup_env_native_trusty.sh"
123124
124125
- stage: test
125126
name: 'x86_64 Linux [GOAL: install] [xenial] [no depends, only system libs, sanitizers: thread (TSan), no wallet]'
126127
env: >-
127-
FILE_ENV="./ci/test/00_setup_env_amd64_tsan.sh"
128+
FILE_ENV="./ci/test/00_setup_env_native_tsan.sh"
128129
TEST_RUNNER_EXTRA="--exclude feature_block" # Not enough memory on travis machines
129130
130131
- stage: test
131132
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
132133
env: >-
133-
FILE_ENV="./ci/test/00_setup_env_amd64_asan.sh"
134+
FILE_ENV="./ci/test/00_setup_env_native_asan.sh"
134135
135136
- stage: test
136137
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
137138
env: >-
138-
FILE_ENV="./ci/test/00_setup_env_amd64_fuzz.sh"
139+
FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
139140
140141
- stage: test
141142
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
142143
env: >-
143-
FILE_ENV="./ci/test/00_setup_env_amd64_nowallet.sh"
144+
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
144145
145146
- stage: test
146147
name: 'macOS 10.10 [GOAL: deploy] [no functional tests]'

‎ci/test/00_setup_env.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ echo "Fallback to default values in env (if not yet set)"
2121
export MAKEJOBS=${MAKEJOBS:--j4}
2222
# A folder for the ci system to put temporary files (ccache, datadirs for tests, ...)
2323
export BASE_SCRATCH_DIR=${BASE_SCRATCH_DIR:-$BASE_ROOT_DIR/ci/scratch/}
24+
# What host to compile for. See also ./depends/README.md
25+
# Tests that need cross-compilation export the appropriate HOST.
26+
# Tests that run natively, do not set a HOST, but we assume x86_64 here if the calling environment did not set a HOST
2427
export HOST=${HOST:-x86_64-unknown-linux-gnu}
2528
# Whether to prefer BusyBox over GNU utilities
2629
export USE_BUSY_BOX=${USE_BUSY_BOX:-false}

ci/test/00_setup_env_amd64_asan.sh renamed to ci/test/00_setup_env_native_asan.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
1110
export NO_DEPENDS=1
1211
export GOAL="install"

ci/test/00_setup_env_amd64_fuzz.sh renamed to ci/test/00_setup_env_native_fuzz.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export PACKAGES="clang llvm python3 libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev"
1110
export NO_DEPENDS=1
1211
export RUN_UNIT_TESTS=false

ci/test/00_setup_env_amd64_nowallet.sh renamed to ci/test/00_setup_env_native_nowallet.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export PACKAGES="python3-zmq"
1110
export DEP_OPTS="NO_WALLET=1"
1211
export GOAL="install"

ci/test/00_setup_env_amd64_qt5.sh renamed to ci/test/00_setup_env_native_qt5.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
1110
export DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
1211
export TEST_RUNNER_EXTRA="--coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash

ci/test/00_setup_env_amd64_trusty.sh renamed to ci/test/00_setup_env_native_trusty.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export DOCKER_NAME_TAG=ubuntu:14.04
1110
export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libicu-dev libpng-dev libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libzmq3-dev libqrencode-dev"
1211
export NO_DEPENDS=1

ci/test/00_setup_env_amd64_tsan.sh renamed to ci/test/00_setup_env_native_tsan.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-unknown-linux-gnu
109
export DOCKER_NAME_TAG=ubuntu:16.04
1110
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
1211
export NO_DEPENDS=1

0 commit comments

Comments
 (0)