aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-12-03 10:33:51 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-12-03 10:34:11 -0500
commit69ca6cdd6610f3ea64fbd91cc172f6f4d54f363b (patch)
tree780b3a94581ed30531d634b33ee4a22859ab4696 /ci
parent2b6575d9895c7da2ec64f2cb04be150f91a600f8 (diff)
parentfabd71076cd9493bd2d30a198467f5ea621b27aa (diff)
Merge #17599: ci: Run functional tests on s390x
fabd71076cd9493bd2d30a198467f5ea621b27aa ci: Print free disk space (MarcoFalke) fad9fdbea5dfb19328282afda9588edc6f1d0ddf test: Properly deserialize integers in little-endian (MarcoFalke) fa94fc10c881e502e6c9a71f3b7719aa955900f9 ci: Run functional tests on s390x (MarcoFalke) Pull request description: Top commit has no ACKs. Tree-SHA512: 98ba77eb56f283131fdaeb393fda86cc308f1bf9781e1e0e5736b8d616528dc8ff2e494d55ba107c138083025c66a59e382fcfa9962d4349a5fd6cbbc52484c3
Diffstat (limited to 'ci')
-rw-r--r--ci/test/00_setup_env_s390x.sh7
-rwxr-xr-xci/test/04_install.sh2
2 files changed, 4 insertions, 5 deletions
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh
index b41d44c61a..89660c7fa4 100644
--- a/ci/test/00_setup_env_s390x.sh
+++ b/ci/test/00_setup_env_s390x.sh
@@ -7,12 +7,9 @@
export LC_ALL=C.UTF-8
export HOST=s390x-unknown-linux-gnu
-export DOCKER_NAME_TAG=s390x/ubuntu:18.04
-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"
+export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools 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"
export NO_DEPENDS=1
export RUN_UNIT_TESTS=true
-export RUN_FUNCTIONAL_TESTS=false
+export RUN_FUNCTIONAL_TESTS=true
export GOAL="install"
export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb"
-
-lscpu
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index ce41c37b6e..5055a72096 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -72,6 +72,8 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
else
DOCKER_EXEC free -m -h
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
+ DOCKER_EXEC echo "Free disk space:"
+ DOCKER_EXEC df -h
fi
if [ -n "$DPKG_ADD_ARCH" ]; then