Skip to content

Commit fa33236

Browse files
author
MarcoFalke
committed
scripted-diff: Rename DOCKER_EXEC to CI_EXEC
-BEGIN VERIFY SCRIPT- sed -i "s/DOCKER_EXEC/CI_EXEC/g" $(git grep -l DOCKER_EXEC) -END VERIFY SCRIPT-
1 parent fa5457e commit fa33236

File tree

4 files changed

+65
-65
lines changed

4 files changed

+65
-65
lines changed

‎ci/test/04_install.sh‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ else
5555
echo "Running on host system without docker wrapper"
5656
fi
5757

58-
DOCKER_EXEC () {
58+
CI_EXEC () {
5959
$DOCKER_CI_CMD_PREFIX bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd \"$P_CI_DIR\" && $*"
6060
}
61-
export -f DOCKER_EXEC
61+
export -f CI_EXEC
6262

6363
if [ -n "$DPKG_ADD_ARCH" ]; then
64-
DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
64+
CI_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
6565
fi
6666

6767
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
68-
${CI_RETRY_EXE} DOCKER_EXEC dnf -y install epel-release
69-
${CI_RETRY_EXE} DOCKER_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
68+
${CI_RETRY_EXE} CI_EXEC dnf -y install epel-release
69+
${CI_RETRY_EXE} CI_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
7070
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
71-
${CI_RETRY_EXE} DOCKER_EXEC apt-get update
72-
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y "$PACKAGES" "$DOCKER_PACKAGES"
71+
${CI_RETRY_EXE} CI_EXEC apt-get update
72+
${CI_RETRY_EXE} CI_EXEC apt-get install --no-install-recommends --no-upgrade -y "$PACKAGES" "$DOCKER_PACKAGES"
7373
if [ -n "$PIP_PACKAGES" ]; then
7474
# shellcheck disable=SC2086
7575
${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
@@ -80,50 +80,50 @@ if [ "$CI_OS_NAME" == "macos" ]; then
8080
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
8181
echo "Number of CPUs: $(sysctl -n hw.logicalcpu)"
8282
else
83-
DOCKER_EXEC free -m -h
84-
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
85-
DOCKER_EXEC echo "$(lscpu | grep Endian)"
83+
CI_EXEC free -m -h
84+
CI_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
85+
CI_EXEC echo "$(lscpu | grep Endian)"
8686
fi
87-
DOCKER_EXEC echo "Free disk space:"
88-
DOCKER_EXEC df -h
87+
CI_EXEC echo "Free disk space:"
88+
CI_EXEC df -h
8989

9090
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
9191
export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/
9292
if [ ! -d "$DIR_FUZZ_IN" ]; then
93-
DOCKER_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets "${DIR_QA_ASSETS}"
93+
CI_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets "${DIR_QA_ASSETS}"
9494
fi
9595
elif [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
9696
export DIR_UNIT_TEST_DATA=${DIR_QA_ASSETS}/unit_test_data/
9797
if [ ! -d "$DIR_UNIT_TEST_DATA" ]; then
98-
DOCKER_EXEC mkdir -p "$DIR_UNIT_TEST_DATA"
99-
DOCKER_EXEC curl --location --fail https://github.com/bitcoin-core/qa-assets/raw/main/unit_test_data/script_assets_test.json -o "${DIR_UNIT_TEST_DATA}/script_assets_test.json"
98+
CI_EXEC mkdir -p "$DIR_UNIT_TEST_DATA"
99+
CI_EXEC curl --location --fail https://github.com/bitcoin-core/qa-assets/raw/main/unit_test_data/script_assets_test.json -o "${DIR_UNIT_TEST_DATA}/script_assets_test.json"
100100
fi
101101
fi
102102

103-
DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
103+
CI_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
104104

105105
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
106-
DOCKER_EXEC "update-alternatives --install /usr/bin/clang++ clang++ \$(which clang++-9) 100"
107-
DOCKER_EXEC "update-alternatives --install /usr/bin/clang clang \$(which clang-9) 100"
108-
DOCKER_EXEC "mkdir -p ${BASE_SCRATCH_DIR}/msan/build/"
109-
DOCKER_EXEC "git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-12.0.0 ${BASE_SCRATCH_DIR}/msan/llvm-project"
110-
DOCKER_EXEC "cd ${BASE_SCRATCH_DIR}/msan/build/ && cmake -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi' -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=Memory -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_TARGETS_TO_BUILD=X86 ../llvm-project/llvm/"
111-
DOCKER_EXEC "cd ${BASE_SCRATCH_DIR}/msan/build/ && make $MAKEJOBS cxx"
106+
CI_EXEC "update-alternatives --install /usr/bin/clang++ clang++ \$(which clang++-9) 100"
107+
CI_EXEC "update-alternatives --install /usr/bin/clang clang \$(which clang-9) 100"
108+
CI_EXEC "mkdir -p ${BASE_SCRATCH_DIR}/msan/build/"
109+
CI_EXEC "git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-12.0.0 ${BASE_SCRATCH_DIR}/msan/llvm-project"
110+
CI_EXEC "cd ${BASE_SCRATCH_DIR}/msan/build/ && cmake -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi' -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=Memory -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_TARGETS_TO_BUILD=X86 ../llvm-project/llvm/"
111+
CI_EXEC "cd ${BASE_SCRATCH_DIR}/msan/build/ && make $MAKEJOBS cxx"
112112
fi
113113

114114
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
115115
echo "Create $BASE_ROOT_DIR"
116-
DOCKER_EXEC rsync -a /ro_base/ "$BASE_ROOT_DIR"
116+
CI_EXEC rsync -a /ro_base/ "$BASE_ROOT_DIR"
117117
fi
118118

119119
if [ "$USE_BUSY_BOX" = "true" ]; then
120120
echo "Setup to use BusyBox utils"
121-
DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/bins/"
121+
CI_EXEC mkdir -p "${BASE_SCRATCH_DIR}/bins/"
122122
# tar excluded for now because it requires passing in the exact archive type in ./depends (fixed in later BusyBox version)
123123
# find excluded for now because it does not recognize the -delete option in ./depends (fixed in later BusyBox version)
124124
# ar excluded for now because it does not recognize the -q option in ./depends (unknown if fixed)
125125
# shellcheck disable=SC1010
126-
DOCKER_EXEC for util in \$\(busybox --list \| grep -v "^ar$" \| grep -v "^tar$" \| grep -v "^find$"\)\; do ln -s \$\(command -v busybox\) "${BASE_SCRATCH_DIR}/bins/\$util"\; done
126+
CI_EXEC for util in \$\(busybox --list \| grep -v "^ar$" \| grep -v "^tar$" \| grep -v "^find$"\)\; do ln -s \$\(command -v busybox\) "${BASE_SCRATCH_DIR}/bins/\$util"\; done
127127
# Print BusyBox version
128-
DOCKER_EXEC patch --help
128+
CI_EXEC patch --help
129129
fi

‎ci/test/05_before_script.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@ export LC_ALL=C.UTF-8
1010
if [ "$CI_OS_NAME" == "macos" ]; then
1111
echo > "${HOME}/Library/Application Support/Bitcoin"
1212
else
13-
DOCKER_EXEC echo \> \$HOME/.bitcoin
13+
CI_EXEC echo \> \$HOME/.bitcoin
1414
fi
1515

16-
DOCKER_EXEC mkdir -p "${DEPENDS_DIR}/SDKs" "${DEPENDS_DIR}/sdk-sources"
16+
CI_EXEC mkdir -p "${DEPENDS_DIR}/SDKs" "${DEPENDS_DIR}/sdk-sources"
1717

1818
OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers"
1919

2020
if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ]; then
2121
OSX_SDK_FILENAME="${OSX_SDK_BASENAME}.tar.gz"
2222
OSX_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${OSX_SDK_FILENAME}"
2323
if [ ! -f "$OSX_SDK_PATH" ]; then
24-
DOCKER_EXEC curl --location --fail "${SDK_URL}/${OSX_SDK_FILENAME}" -o "$OSX_SDK_PATH"
24+
CI_EXEC curl --location --fail "${SDK_URL}/${OSX_SDK_FILENAME}" -o "$OSX_SDK_PATH"
2525
fi
26-
DOCKER_EXEC tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
26+
CI_EXEC tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
2727
fi
2828

2929
if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then
3030
ANDROID_TOOLS_PATH=${DEPENDS_DIR}/sdk-sources/android-tools.zip
3131
if [ ! -f "$ANDROID_TOOLS_PATH" ]; then
32-
DOCKER_EXEC curl --location --fail "${ANDROID_TOOLS_URL}" -o "$ANDROID_TOOLS_PATH"
32+
CI_EXEC curl --location --fail "${ANDROID_TOOLS_URL}" -o "$ANDROID_TOOLS_PATH"
3333
fi
34-
DOCKER_EXEC mkdir -p "${ANDROID_HOME}/cmdline-tools"
35-
DOCKER_EXEC unzip -o "$ANDROID_TOOLS_PATH" -d "${ANDROID_HOME}/cmdline-tools"
36-
DOCKER_EXEC "yes | ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --install \"build-tools;${ANDROID_BUILD_TOOLS_VERSION}\" \"platform-tools\" \"platforms;android-${ANDROID_API_LEVEL}\" \"ndk;${ANDROID_NDK_VERSION}\""
34+
CI_EXEC mkdir -p "${ANDROID_HOME}/cmdline-tools"
35+
CI_EXEC unzip -o "$ANDROID_TOOLS_PATH" -d "${ANDROID_HOME}/cmdline-tools"
36+
CI_EXEC "yes | ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --install \"build-tools;${ANDROID_BUILD_TOOLS_VERSION}\" \"platform-tools\" \"platforms;android-${ANDROID_API_LEVEL}\" \"ndk;${ANDROID_NDK_VERSION}\""
3737
fi
3838

3939
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
4040
# Use BDB compiled using install_db4.sh script to work around linking issue when using BDB
4141
# from depends. See https://github.com/bitcoin/bitcoin/pull/18288#discussion_r433189350 for
4242
# details.
43-
DOCKER_EXEC "contrib/install_db4.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
43+
CI_EXEC "contrib/install_db4.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
4444
fi
4545

4646
if [[ $HOST = *-mingw32 ]]; then
47-
DOCKER_EXEC update-alternatives --set "${HOST}-g++" \$\(which "${HOST}-g++-posix"\)
47+
CI_EXEC update-alternatives --set "${HOST}-g++" \$\(which "${HOST}-g++-posix"\)
4848
fi
4949
if [ -z "$NO_DEPENDS" ]; then
5050
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
@@ -55,8 +55,8 @@ if [ -z "$NO_DEPENDS" ]; then
5555
else
5656
SHELL_OPTS="CONFIG_SHELL="
5757
fi
58-
DOCKER_EXEC "$SHELL_OPTS" make "$MAKEJOBS" -C depends HOST="$HOST" "$DEP_OPTS"
58+
CI_EXEC "$SHELL_OPTS" make "$MAKEJOBS" -C depends HOST="$HOST" "$DEP_OPTS"
5959
fi
6060
if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
61-
DOCKER_EXEC test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" "${PREVIOUS_RELEASES_TO_DOWNLOAD}"
61+
CI_EXEC test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" "${PREVIOUS_RELEASES_TO_DOWNLOAD}"
6262
fi

‎ci/test/06_script_a.sh‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,49 @@
77
export LC_ALL=C.UTF-8
88

99
if [ -n "$ANDROID_TOOLS_URL" ]; then
10-
DOCKER_EXEC make distclean || true
11-
DOCKER_EXEC ./autogen.sh
12-
DOCKER_EXEC ./configure "$BITCOIN_CONFIG" --prefix="${DEPENDS_DIR}/aarch64-linux-android" || ( (DOCKER_EXEC cat config.log) && false)
13-
DOCKER_EXEC "make $MAKEJOBS && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk"
10+
CI_EXEC make distclean || true
11+
CI_EXEC ./autogen.sh
12+
CI_EXEC ./configure "$BITCOIN_CONFIG" --prefix="${DEPENDS_DIR}/aarch64-linux-android" || ( (CI_EXEC cat config.log) && false)
13+
CI_EXEC "make $MAKEJOBS && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk"
1414
exit 0
1515
fi
1616

1717
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
1818
if [ -z "$NO_WERROR" ]; then
1919
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
2020
fi
21-
DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
21+
CI_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
2222

2323
if [ -n "$CONFIG_SHELL" ]; then
24-
DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
24+
CI_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
2525
else
26-
DOCKER_EXEC ./autogen.sh
26+
CI_EXEC ./autogen.sh
2727
fi
2828

29-
DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}"
29+
CI_EXEC mkdir -p "${BASE_BUILD_DIR}"
3030
export P_CI_DIR="${BASE_BUILD_DIR}"
3131

32-
DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (DOCKER_EXEC cat config.log) && false)
32+
CI_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (CI_EXEC cat config.log) && false)
3333

34-
DOCKER_EXEC make distdir VERSION="$HOST"
34+
CI_EXEC make distdir VERSION="$HOST"
3535

3636
export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST"
3737

38-
DOCKER_EXEC ./configure --cache-file=../config.cache "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (DOCKER_EXEC cat config.log) && false)
38+
CI_EXEC ./configure --cache-file=../config.cache "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (CI_EXEC cat config.log) && false)
3939

4040
set -o errtrace
41-
trap 'DOCKER_EXEC "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
41+
trap 'CI_EXEC "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
4242

4343
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
4444
# MemorySanitizer (MSAN) does not support tracking memory initialization done by
4545
# using the Linux getrandom syscall. Avoid using getrandom by undefining
4646
# HAVE_SYS_GETRANDOM. See https://github.com/google/sanitizers/issues/852 for
4747
# details.
48-
DOCKER_EXEC 'grep -v HAVE_SYS_GETRANDOM src/config/bitcoin-config.h > src/config/bitcoin-config.h.tmp && mv src/config/bitcoin-config.h.tmp src/config/bitcoin-config.h'
48+
CI_EXEC 'grep -v HAVE_SYS_GETRANDOM src/config/bitcoin-config.h > src/config/bitcoin-config.h.tmp && mv src/config/bitcoin-config.h.tmp src/config/bitcoin-config.h'
4949
fi
5050

51-
DOCKER_EXEC make "$MAKEJOBS" "$GOAL" || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make "$GOAL" V=1 ; false )
51+
CI_EXEC make "$MAKEJOBS" "$GOAL" || ( echo "Build failure. Verbose build follows." && CI_EXEC make "$GOAL" V=1 ; false )
5252

53-
DOCKER_EXEC "ccache --version | head -n 1 && ccache --show-stats"
54-
DOCKER_EXEC du -sh "${DEPENDS_DIR}"/*/
55-
DOCKER_EXEC du -sh "${PREVIOUS_RELEASES_DIR}"
53+
CI_EXEC "ccache --version | head -n 1 && ccache --show-stats"
54+
CI_EXEC du -sh "${DEPENDS_DIR}"/*/
55+
CI_EXEC du -sh "${PREVIOUS_RELEASES_DIR}"

‎ci/test/06_script_b.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ export LC_ALL=C.UTF-8
88

99
if [[ $HOST = *-mingw32 ]]; then
1010
# Generate all binaries, so that they can be wrapped
11-
DOCKER_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
12-
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
11+
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
12+
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
1313
fi
1414

1515
if [ -n "$QEMU_USER_CMD" ]; then
1616
# Generate all binaries, so that they can be wrapped
17-
DOCKER_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
18-
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
17+
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
18+
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
1919
fi
2020

2121
if [ -n "$USE_VALGRIND" ]; then
22-
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
22+
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
2323
fi
2424

2525
if [ "$RUN_UNIT_TESTS" = "true" ]; then
26-
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
26+
CI_EXEC "${TEST_RUNNER_ENV}" DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" make "$MAKEJOBS" check VERBOSE=1
2727
fi
2828

2929
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
30-
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
30+
CI_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
3131
fi
3232

3333
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
34-
DOCKER_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${TEST_RUNNER_ENV}" test/functional/test_runner.py --ci "$MAKEJOBS" --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 --timeout-factor="${TEST_RUNNER_TIMEOUT_FACTOR}" "${TEST_RUNNER_EXTRA}" --quiet --failfast
34+
CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${TEST_RUNNER_ENV}" test/functional/test_runner.py --ci "$MAKEJOBS" --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 --timeout-factor="${TEST_RUNNER_TIMEOUT_FACTOR}" "${TEST_RUNNER_EXTRA}" --quiet --failfast
3535
fi
3636

3737
if [ "$RUN_SECURITY_TESTS" = "true" ]; then
38-
DOCKER_EXEC make test-security-check
38+
CI_EXEC make test-security-check
3939
fi
4040

4141
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
42-
DOCKER_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
42+
CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
4343
fi

0 commit comments

Comments
 (0)