Skip to content

Commit 10f5389

Browse files
author
Claude Code
committed
validation: Apply standard Dash adaptations to CI script
- Replace Bitcoin with DashCore in macOS application support path - Replace .bitcoin with .dashcore - Rename BITCOIN_CONFIG_ALL to DASH_CONFIG_ALL throughout - Replace bitcoin- with dash- in build directories - Update config file names from bitcoin-config.h to dash-config.h - Update test binary from test_bitcoin to test_dash - Update IWYU mapping file from bitcoin.core.imp to dash.core.imp These are standard adaptations required for all Bitcoin backports to Dash.
1 parent 5c9caba commit 10f5389

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

ci/test/06_script_b.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ fi
4545

4646
# Make sure default datadir does not exist and is never read by creating a dummy file
4747
if [ "$CI_OS_NAME" == "macos" ]; then
48-
echo > "${HOME}/Library/Application Support/Bitcoin"
48+
echo > "${HOME}/Library/Application Support/DashCore"
4949
else
50-
echo > "${HOME}/.bitcoin"
50+
echo > "${HOME}/.dashcore"
5151
fi
5252

5353
if [ -z "$NO_DEPENDS" ]; then
@@ -65,12 +65,12 @@ if [ "$DOWNLOAD_PREVIOUS_RELEASES" = "true" ]; then
6565
test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR"
6666
fi
6767

68-
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking"
68+
DASH_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking"
6969
if [ -z "$NO_DEPENDS" ]; then
70-
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site"
70+
DASH_CONFIG_ALL="${DASH_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site"
7171
fi
7272
if [ -z "$NO_WERROR" ]; then
73-
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
73+
DASH_CONFIG_ALL="${DASH_CONFIG_ALL} --enable-werror"
7474
fi
7575

7676
ccache --zero-stats --max-size="${CCACHE_SIZE}"
@@ -79,13 +79,13 @@ PRINT_CCACHE_STATISTICS="ccache --version | head -n 1 && ccache --show-stats"
7979
if [ -n "$ANDROID_TOOLS_URL" ]; then
8080
make distclean || true
8181
./autogen.sh
82-
bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
82+
bash -c "./configure $DASH_CONFIG_ALL $DASH_CONFIG" || ( (cat config.log) && false)
8383
make "${MAKEJOBS}" && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk
8484
bash -c "${PRINT_CCACHE_STATISTICS}"
8585
exit 0
8686
fi
8787

88-
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR"
88+
DASH_CONFIG_ALL="${DASH_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR"
8989

9090
if [ -n "$CONFIG_SHELL" ]; then
9191
"$CONFIG_SHELL" -c "./autogen.sh"
@@ -96,13 +96,13 @@ fi
9696
mkdir -p "${BASE_BUILD_DIR}"
9797
cd "${BASE_BUILD_DIR}"
9898

99-
bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
99+
bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $DASH_CONFIG_ALL $DASH_CONFIG" || ( (cat config.log) && false)
100100

101101
make distdir VERSION="$HOST"
102102

103-
cd "${BASE_BUILD_DIR}/bitcoin-$HOST"
103+
cd "${BASE_BUILD_DIR}/dash-$HOST"
104104

105-
bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
105+
bash -c "./configure --cache-file=../config.cache $DASH_CONFIG_ALL $DASH_CONFIG" || ( (cat config.log) && false)
106106

107107
set -o errtrace
108108
trap 'bash -c "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
@@ -112,7 +112,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
112112
# using the Linux getrandom syscall. Avoid using getrandom by undefining
113113
# HAVE_SYS_GETRANDOM. See https://github.com/google/sanitizers/issues/852 for
114114
# details.
115-
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
115+
grep -v HAVE_SYS_GETRANDOM src/config/dash-config.h > src/config/dash-config.h.tmp && mv src/config/dash-config.h.tmp src/config/dash-config.h
116116
fi
117117

118118
if [[ "${RUN_TIDY}" == "true" ]]; then
@@ -149,7 +149,7 @@ if [ "$RUN_UNIT_TESTS" = "true" ]; then
149149
fi
150150

151151
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
152-
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"
152+
bash -c "${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=${DEPENDS_DIR}/${HOST}/lib ${BASE_OUTDIR}/bin/test_dash --catch_system_errors=no -l test_suite"
153153
fi
154154

155155
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
@@ -158,9 +158,9 @@ fi
158158

159159
if [ "${RUN_TIDY}" = "true" ]; then
160160
set -eo pipefail
161-
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
161+
cd "${BASE_BUILD_DIR}/dash-$HOST/src/"
162162
( run-clang-tidy-16 -quiet "${MAKEJOBS}" ) | grep -C5 "error"
163-
cd "${BASE_BUILD_DIR}/bitcoin-$HOST/"
163+
cd "${BASE_BUILD_DIR}/dash-$HOST/"
164164
python3 "${DIR_IWYU}/include-what-you-use/iwyu_tool.py" \
165165
src/common/args.cpp \
166166
src/common/config.cpp \
@@ -206,7 +206,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
206206
src/util/threadinterrupt.cpp \
207207
src/zmq \
208208
-p . "${MAKEJOBS}" \
209-
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
209+
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/dash-$HOST/contrib/devtools/iwyu/dash.core.imp" \
210210
2>&1 | tee /tmp/iwyu_ci.out
211211
cd "${BASE_ROOT_DIR}/src"
212212
python3 "${DIR_IWYU}/include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out

0 commit comments

Comments
 (0)