Commit fa00393 MarcoFalke
committed
1 parent 8021392 commit fa00393 Copy full SHA for fa00393
File tree 4 files changed +10
-9
lines changed
4 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,6 @@ if [ ! -d ${DIR_QA_ASSETS} ]; then
40
40
fi
41
41
export DIR_FUZZ_IN=${DIR_QA_ASSETS} /fuzz_seed_corpus/
42
42
43
- mkdir -p " ${BASE_BUILD_DIR} /sanitizer-output/"
44
43
export ASAN_OPTIONS=" detect_stack_use_after_return=1"
45
44
export LSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/lsan"
46
45
export TSAN_OPTIONS=" suppressions=${BASE_BUILD_DIR} /test/sanitizer_suppressions/tsan:log_path=${BASE_BUILD_DIR} /sanitizer-output/tsan"
@@ -85,6 +84,8 @@ if [ "$TRAVIS_OS_NAME" != "osx" ]; then
85
84
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
86
85
fi
87
86
87
+ DOCKER_EXEC mkdir -p " ${BASE_BUILD_DIR} /sanitizer-output/"
88
+
88
89
if [ " $USE_BUSY_BOX " = " true" ]; then
89
90
echo " Setup to use BusyBox utils"
90
91
DOCKER_EXEC mkdir -p $BASE_SCRATCH_DIR /bins/
Original file line number Diff line number Diff line change 13
13
DOCKER_EXEC echo \> \$ HOME/.bitcoin
14
14
fi
15
15
16
- mkdir -p depends/SDKs depends/sdk-sources
16
+ DOCKER_EXEC mkdir -p depends/SDKs depends/sdk-sources
17
17
18
18
if [ -n " $OSX_SDK " ] && [ ! -f depends/sdk-sources/MacOSX${OSX_SDK} .sdk.tar.gz ]; then
19
19
curl --location --fail $SDK_URL /MacOSX${OSX_SDK} .sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK} .sdk.tar.gz
20
20
fi
21
21
if [ -n " $OSX_SDK " ] && [ -f depends/sdk-sources/MacOSX${OSX_SDK} .sdk.tar.gz ]; then
22
- tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK} .sdk.tar.gz
22
+ DOCKER_EXEC tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK} .sdk.tar.gz
23
23
fi
24
24
if [[ $HOST = * -mingw32 ]]; then
25
25
DOCKER_EXEC update-alternatives --set $HOST -g++ \$\( which $HOST -g++-posix\)
Original file line number Diff line number Diff line change 19
19
fi
20
20
END_FOLD
21
21
22
+ # Create folder on host and docker, so that `cd` works
22
23
mkdir -p build
24
+ DOCKER_EXEC mkdir -p build
23
25
24
26
# Temporarily disable errexit, because Travis macOS fails without error message
25
27
set +o errexit
26
28
cd build || (echo " could not enter build directory" ; exit 1)
27
29
set -o errexit
28
30
29
31
BEGIN_FOLD configure
30
- DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
32
+ DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
31
33
END_FOLD
32
34
33
35
BEGIN_FOLD distdir
36
+ # Create folder on host and docker, so that `cd` works
37
+ mkdir -p " bitcoin-$HOST "
34
38
DOCKER_EXEC make distdir VERSION=$HOST
35
39
END_FOLD
36
40
@@ -39,7 +43,7 @@ cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1)
39
43
set -o errexit
40
44
41
45
BEGIN_FOLD configure
42
- DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
46
+ DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
43
47
END_FOLD
44
48
45
49
set -o errtrace
Original file line number Diff line number Diff line change @@ -48,7 +48,3 @@ if [ "$RUN_FUZZ_TESTS" = "true" ]; then
48
48
DOCKER_EXEC test/fuzz/test_runner.py -l DEBUG ${DIR_FUZZ_IN}
49
49
END_FOLD
50
50
fi
51
-
52
- set +o errexit
53
- cd ${BASE_BUILD_DIR} || (echo " could not enter travis build dir $BASE_BUILD_DIR " ; exit 1)
54
- set -o errexit
You can’t perform that action at this time.
0 commit comments