diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-11-22 13:58:53 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-11-22 13:57:55 -0500 |
| commit | fad88e6f86d1dd32cf01db2287df9c63e66c5116 (patch) | |
| tree | 5204b698fcb948fdcf7b211219fc6e454c3f0513 /ci/test/06_script_a.sh | |
| parent | fa2941bbf47a8a6b79b8db4a87e1aedcf6a29a5e (diff) | |
| download | bitcoin-fad88e6f86d1dd32cf01db2287df9c63e66c5116.tar.xz | |
ci: Remove use of cd
Diffstat (limited to 'ci/test/06_script_a.sh')
| -rwxr-xr-x | ci/test/06_script_a.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index b70ef47a47..98b75d7497 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -19,14 +19,8 @@ else fi END_FOLD -# Create folder on host and docker, so that `cd` works -mkdir -p build DOCKER_EXEC mkdir -p build - -# Temporarily disable errexit, because Travis macOS fails without error message -set +o errexit -cd build || (echo "could not enter build directory"; exit 1) -set -o errexit +export P_CI_DIR="$P_CI_DIR/build" BEGIN_FOLD configure DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false) @@ -38,9 +32,7 @@ mkdir -p "bitcoin-$HOST" DOCKER_EXEC make distdir VERSION=$HOST END_FOLD -set +o errexit -cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1) -set -o errexit +export P_CI_DIR="$P_CI_DIR/bitcoin-$HOST" BEGIN_FOLD configure DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false) @@ -52,7 +44,3 @@ trap 'DOCKER_EXEC "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR BEGIN_FOLD build DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ) END_FOLD - -set +o errexit -cd ${BASE_ROOT_DIR} || (echo "could not enter base root dir $BASE_ROOT_DIR"; exit 1) -set -o errexit |