mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-04 13:55:23 -05:00
Merge #20315: travis: Remove s390x build
fa2c3c0d96
ci: Set LC_ALL=C to allow running the s390x tests in qemu (MarcoFalke)fac0517836
travis: Remove s390x build (MarcoFalke) Pull request description: This has been discussed in the last meeting. Refer to the commit body for more details. Top commit has no ACKs. Tree-SHA512: 8e0455286ce41c95ed2e5eb624ac534251bb4a321f13d26d14356497e0c39f841372e166373ffd4a0a9fa379636c2cfb535bd92534fff427cdcb827354e66b6c
This commit is contained in:
commit
7e373294a5
3 changed files with 3 additions and 9 deletions
|
@ -72,13 +72,6 @@ jobs:
|
||||||
FILE_ENV="./ci/test/00_setup_env_arm.sh"
|
FILE_ENV="./ci/test/00_setup_env_arm.sh"
|
||||||
QEMU_USER_CMD=""
|
QEMU_USER_CMD=""
|
||||||
|
|
||||||
- stage: test
|
|
||||||
name: 'S390x [GOAL: install] [buster] [unit tests, functional tests]'
|
|
||||||
arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu
|
|
||||||
env: >-
|
|
||||||
FILE_ENV="./ci/test/00_setup_env_s390x.sh"
|
|
||||||
QEMU_USER_CMD=""
|
|
||||||
|
|
||||||
- stage: test
|
- stage: test
|
||||||
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]'
|
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]'
|
||||||
env: >-
|
env: >-
|
||||||
|
|
|
@ -20,6 +20,7 @@ fi
|
||||||
export CONTAINER_NAME=ci_s390x
|
export CONTAINER_NAME=ci_s390x
|
||||||
export DOCKER_NAME_TAG="debian:buster"
|
export DOCKER_NAME_TAG="debian:buster"
|
||||||
export RUN_UNIT_TESTS=true
|
export RUN_UNIT_TESTS=true
|
||||||
|
export TEST_RUNNER_ENV="LC_ALL=C"
|
||||||
export RUN_FUNCTIONAL_TESTS=true
|
export RUN_FUNCTIONAL_TESTS=true
|
||||||
export GOAL="install"
|
export GOAL="install"
|
||||||
export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb --with-boost-process"
|
export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb --with-boost-process"
|
||||||
|
|
|
@ -23,13 +23,13 @@ fi
|
||||||
|
|
||||||
if [ "$RUN_UNIT_TESTS" = "true" ]; then
|
if [ "$RUN_UNIT_TESTS" = "true" ]; then
|
||||||
BEGIN_FOLD unit-tests
|
BEGIN_FOLD unit-tests
|
||||||
DOCKER_EXEC DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib make $MAKEJOBS check VERBOSE=1
|
DOCKER_EXEC ${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib make $MAKEJOBS check VERBOSE=1
|
||||||
END_FOLD
|
END_FOLD
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
|
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
|
||||||
BEGIN_FOLD unit-tests-seq
|
BEGIN_FOLD unit-tests-seq
|
||||||
DOCKER_EXEC DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib "${BASE_BUILD_DIR}/bitcoin-*/src/test/test_bitcoin*" --catch_system_errors=no -l test_suite
|
DOCKER_EXEC ${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib "${BASE_BUILD_DIR}/bitcoin-*/src/test/test_bitcoin*" --catch_system_errors=no -l test_suite
|
||||||
END_FOLD
|
END_FOLD
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue