mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-09-08 17:07:41 +02:00
ci: Remove CI_EXEC bloat in test/06_script_b.sh
This commit is contained in:
MarcoFalke
@@ -6,96 +6,98 @@
|
|||||||
|
|
||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
|
||||||
if [[ $HOST = *-mingw32 ]]; then
|
if [[ $HOST = *-mingw32 ]]; then
|
||||||
# Generate all binaries, so that they can be wrapped
|
# Generate all binaries, so that they can be wrapped
|
||||||
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
|
make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
|
||||||
CI_EXEC make "$MAKEJOBS" -C src minisketch/test.exe VERBOSE=1
|
make "$MAKEJOBS" -C src minisketch/test.exe VERBOSE=1
|
||||||
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
|
"${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$QEMU_USER_CMD" ]; then
|
if [ -n "$QEMU_USER_CMD" ]; then
|
||||||
# Generate all binaries, so that they can be wrapped
|
# Generate all binaries, so that they can be wrapped
|
||||||
CI_EXEC make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
|
make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
|
||||||
CI_EXEC make "$MAKEJOBS" -C src minisketch/test VERBOSE=1
|
make "$MAKEJOBS" -C src minisketch/test VERBOSE=1
|
||||||
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
|
"${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$USE_VALGRIND" ]; then
|
if [ -n "$USE_VALGRIND" ]; then
|
||||||
CI_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
|
"${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_UNIT_TESTS" = "true" ]; then
|
if [ "$RUN_UNIT_TESTS" = "true" ]; then
|
||||||
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
|
bash -c "${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=${DEPENDS_DIR}/${HOST}/lib make $MAKEJOBS check VERBOSE=1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
|
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
|
||||||
CI_EXEC "${TEST_RUNNER_ENV}" DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${BASE_OUTDIR}/bin/test_bitcoin" --catch_system_errors=no -l test_suite
|
bash -c "${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=${DEPENDS_DIR}/${HOST}/lib ${BASE_OUTDIR}/bin/test_bitcoin --catch_system_errors=no -l test_suite"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
|
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
|
||||||
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=99999999 --timeout-factor="${TEST_RUNNER_TIMEOUT_FACTOR}" "${TEST_RUNNER_EXTRA}" --quiet --failfast
|
bash -c "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=99999999 --timeout-factor=${TEST_RUNNER_TIMEOUT_FACTOR} ${TEST_RUNNER_EXTRA} --quiet --failfast"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${RUN_TIDY}" = "true" ]; then
|
if [ "${RUN_TIDY}" = "true" ]; then
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
|
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
|
||||||
( CI_EXEC run-clang-tidy-16 -quiet "${MAKEJOBS}" ) | grep -C5 "error"
|
( run-clang-tidy-16 -quiet "${MAKEJOBS}" ) | grep -C5 "error"
|
||||||
export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST/"
|
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/"
|
||||||
CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/iwyu_tool.py"\
|
python3 "${DIR_IWYU}/include-what-you-use/iwyu_tool.py" \
|
||||||
" src/common/args.cpp"\
|
src/common/args.cpp \
|
||||||
" src/common/config.cpp"\
|
src/common/config.cpp \
|
||||||
" src/common/init.cpp"\
|
src/common/init.cpp \
|
||||||
" src/common/url.cpp"\
|
src/common/url.cpp \
|
||||||
" src/compat"\
|
src/compat \
|
||||||
" src/dbwrapper.cpp"\
|
src/dbwrapper.cpp \
|
||||||
" src/init"\
|
src/init \
|
||||||
" src/kernel"\
|
src/kernel \
|
||||||
" src/node/chainstate.cpp"\
|
src/node/chainstate.cpp \
|
||||||
" src/node/chainstatemanager_args.cpp"\
|
src/node/chainstatemanager_args.cpp \
|
||||||
" src/node/mempool_args.cpp"\
|
src/node/mempool_args.cpp \
|
||||||
" src/node/minisketchwrapper.cpp"\
|
src/node/minisketchwrapper.cpp \
|
||||||
" src/node/utxo_snapshot.cpp"\
|
src/node/utxo_snapshot.cpp \
|
||||||
" src/node/validation_cache_args.cpp"\
|
src/node/validation_cache_args.cpp \
|
||||||
" src/policy/feerate.cpp"\
|
src/policy/feerate.cpp \
|
||||||
" src/policy/packages.cpp"\
|
src/policy/packages.cpp \
|
||||||
" src/policy/settings.cpp"\
|
src/policy/settings.cpp \
|
||||||
" src/primitives/transaction.cpp"\
|
src/primitives/transaction.cpp \
|
||||||
" src/random.cpp"\
|
src/random.cpp \
|
||||||
" src/rpc/fees.cpp"\
|
src/rpc/fees.cpp \
|
||||||
" src/rpc/signmessage.cpp"\
|
src/rpc/signmessage.cpp \
|
||||||
" src/test/fuzz/string.cpp"\
|
src/test/fuzz/string.cpp \
|
||||||
" src/test/fuzz/txorphan.cpp"\
|
src/test/fuzz/txorphan.cpp \
|
||||||
" src/test/fuzz/util/"\
|
src/test/fuzz/util \
|
||||||
" src/test/util/coins.cpp"\
|
src/test/util/coins.cpp \
|
||||||
" src/uint256.cpp"\
|
src/uint256.cpp \
|
||||||
" src/util/bip32.cpp"\
|
src/util/bip32.cpp \
|
||||||
" src/util/bytevectorhash.cpp"\
|
src/util/bytevectorhash.cpp \
|
||||||
" src/util/check.cpp"\
|
src/util/check.cpp \
|
||||||
" src/util/error.cpp"\
|
src/util/error.cpp \
|
||||||
" src/util/exception.cpp"\
|
src/util/exception.cpp \
|
||||||
" src/util/getuniquepath.cpp"\
|
src/util/getuniquepath.cpp \
|
||||||
" src/util/hasher.cpp"\
|
src/util/hasher.cpp \
|
||||||
" src/util/message.cpp"\
|
src/util/message.cpp \
|
||||||
" src/util/moneystr.cpp"\
|
src/util/moneystr.cpp \
|
||||||
" src/util/serfloat.cpp"\
|
src/util/serfloat.cpp \
|
||||||
" src/util/spanparsing.cpp"\
|
src/util/spanparsing.cpp \
|
||||||
" src/util/strencodings.cpp"\
|
src/util/strencodings.cpp \
|
||||||
" src/util/string.cpp"\
|
src/util/string.cpp \
|
||||||
" src/util/syserror.cpp"\
|
src/util/syserror.cpp \
|
||||||
" src/util/threadinterrupt.cpp"\
|
src/util/threadinterrupt.cpp \
|
||||||
" src/zmq"\
|
src/zmq \
|
||||||
" -p . ${MAKEJOBS}"\
|
-p . "${MAKEJOBS}" \
|
||||||
" -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"\
|
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
|
||||||
" |& tee /tmp/iwyu_ci.out"
|
2>&1 | tee /tmp/iwyu_ci.out
|
||||||
export P_CI_DIR="${BASE_ROOT_DIR}/src"
|
cd "${BASE_ROOT_DIR}/src"
|
||||||
CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out"
|
python3 "${DIR_IWYU}/include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
|
||||||
CI_EXEC "git --no-pager diff"
|
git --no-pager diff
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_SECURITY_TESTS" = "true" ]; then
|
if [ "$RUN_SECURITY_TESTS" = "true" ]; then
|
||||||
CI_EXEC make test-security-check
|
make test-security-check
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
|
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
|
||||||
CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
|
bash -c "LD_LIBRARY_PATH=${DEPENDS_DIR}/${HOST}/lib test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} $MAKEJOBS -l DEBUG ${DIR_FUZZ_IN}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ set -o errexit; source ./ci/test/00_setup_env.sh
|
|||||||
set -o errexit; source ./ci/test/04_install.sh
|
set -o errexit; source ./ci/test/04_install.sh
|
||||||
set -o errexit; source ./ci/test/05_before_script.sh
|
set -o errexit; source ./ci/test/05_before_script.sh
|
||||||
set -o errexit; source ./ci/test/06_script_a.sh
|
set -o errexit; source ./ci/test/06_script_a.sh
|
||||||
set -o errexit; source ./ci/test/06_script_b.sh
|
set -o errexit
|
||||||
|
CI_EXEC "${BASE_ROOT_DIR}/ci/test/06_script_b.sh"
|
||||||
|
|
||||||
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
||||||
echo "Stop and remove CI container by ID"
|
echo "Stop and remove CI container by ID"
|
||||||
|
|||||||
Reference in New Issue
Block a user