Skip to content

Commit 4493777

Browse files
PastaPastaPastaPastaPastaPasta
committed
33167b1 trivial: clang format after scripted diff (Konstantin Akimov) 7008d6a Merge bitcoin#22981: doc: Fix incorrect C++ named args (fanquake) c66be02 Merge bitcoin#23546: scripted-diff: Use clang-tidy syntax for C++ named arguments (tests only) (Konstantin Akimov) b4cd8d5 Merge bitcoin#23600: doc: Tidy up nMinDiskSpace comment (fanquake) 9536eed Merge bitcoin#23348: rpc, wallet: Do not return "keypoololdest" for blank descriptor wallets (Samuel Dobson) b3ab694 partial Merge bitcoin#23540: test: add decodescript RPC test for P2TR output script (MarcoFalke) 27c6fc7 Merge bitcoin#23525: doc: Pick better named args for MutableTransactionSignatureCreator (MarcoFalke) 130ac16 Merge bitcoin#23520: ci: Rework ci task names (take 3) (fanquake) 6f91a07 Merge bitcoin#23504: ci: Replace soon EOL hirsute with jammy (fanquake) 1eab3dc Merge bitcoin#23462: test: Enable SC2046 and SC2086 shellcheck rules (W. J. van der Laan) 92d78e3 Merge bitcoin#23510: doc: Fixed dead link in build-unix.md (fanquake) ebedc74 Merge bitcoin#23473: build: boring autotools cleanup (fanquake) Pull request description: ## What was done? Regular backports from Bitcoin Core v23 ## How Has This Been Tested? Run unit / functional tests ## Breaking Changes N/A ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 33167b1 Tree-SHA512: eae5018113b3dcd352a65575ebd3a3e6d0e27742dd7d567a3899cdec71bc32352975bb287ee29e5ec269dbf94c5bb275729ddd0c0fefa597290366e9fc5c50ed
2 parents 55a3910 + 33167b1 commit 4493777

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+589
-622
lines changed

‎.cirrus.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ task:
104104
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
105105

106106
task:
107-
name: '[depends, sanitizers: thread (TSan), no gui] [lunar]'
107+
name: '[TSan, depends, no gui] [lunar]'
108108
<< : *GLOBAL_TASK_TEMPLATE
109109
container:
110110
image: ubuntu:lunar
@@ -114,7 +114,7 @@ task:
114114
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
115115

116116
task:
117-
name: '[depends, sanitizers: memory (MSan)] [jammy]'
117+
name: '[MSan, depends] [jammy]'
118118
<< : *GLOBAL_TASK_TEMPLATE
119119
container:
120120
image: ubuntu:jammy
@@ -123,16 +123,16 @@ task:
123123
MAKEJOBS: "-j4" # Avoid excessive memory use due to MSan
124124

125125
task:
126-
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]'
126+
name: '[ASan + LSan + UBSan + integer, no depends] [jammy]'
127127
<< : *GLOBAL_TASK_TEMPLATE
128128
container:
129-
image: ubuntu:hirsute
129+
image: ubuntu:jammy
130130
env:
131131
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
132132
MAKEJOBS: "-j4" # Avoid excessive memory use
133133

134134
task:
135-
name: '[no depends, sanitizers: fuzzer,address,undefined,integer] [jammy]'
135+
name: '[fuzzer,address,undefined,integer, no depends] [jammy]'
136136
<< : *GLOBAL_TASK_TEMPLATE
137137
container:
138138
image: ubuntu:jammy

‎build-aux/m4/ax_check_compile_flag.m4‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,33 +29,12 @@
2929
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
3030
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 4
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
6140
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

‎build-aux/m4/ax_check_link_flag.m4‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,33 +29,12 @@
2929
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
3030
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 4
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_LINK_FLAG],
6140
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

‎build-aux/m4/ax_check_preproc_flag.m4‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,33 +29,12 @@
2929
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
3030
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 4
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_PREPROC_FLAG],
6140
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

‎build-aux/m4/bitcoin_find_bdb48.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ dnl Distributed under the MIT software license, see the accompanying
33
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
AC_DEFUN([BITCOIN_FIND_BDB48],[
6-
AC_ARG_VAR(BDB_CFLAGS, [C compiler flags for BerkeleyDB, bypasses autodetection])
7-
AC_ARG_VAR(BDB_LIBS, [Linker flags for BerkeleyDB, bypasses autodetection])
6+
AC_ARG_VAR([BDB_CFLAGS], [C compiler flags for BerkeleyDB, bypasses autodetection])
7+
AC_ARG_VAR([BDB_LIBS], [Linker flags for BerkeleyDB, bypasses autodetection])
88
99
if test "x$use_bdb" = "xno"; then
1010
use_bdb=no

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
3636
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
3737
BITCOIN_QT_CHECK([
3838
if test "x$3" != x; then
39-
AC_PATH_PROGS($1,$2,,$3)
39+
AC_PATH_PROGS([$1], [$2], [], [$3])
4040
else
41-
AC_PATH_PROGS($1,$2)
41+
AC_PATH_PROGS([$1], [$2])
4242
fi
4343
if test "x$$1" = x && test "x$4" != xyes; then
4444
BITCOIN_QT_FAIL([$1 not found])
@@ -139,29 +139,29 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
139139
140140
if test "x$TARGET_OS" != xandroid; then
141141
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QMinimalIntegrationPlugin], [-lqminimal])
142-
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
142+
AC_DEFINE([QT_QPA_PLATFORM_MINIMAL], [1], [Define this symbol if the minimal qt platform exists])
143143
fi
144144
if test "x$TARGET_OS" = xwindows; then
145145
dnl Linking against wtsapi32 is required. See #17749 and
146146
dnl https://bugreports.qt.io/browse/QTBUG-27097.
147147
AX_CHECK_LINK_FLAG([-lwtsapi32], [QT_LIBS="$QT_LIBS -lwtsapi32"], [AC_MSG_ERROR([could not link against -lwtsapi32])])
148148
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsIntegrationPlugin], [-lqwindows])
149149
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsVistaStylePlugin], [-lqwindowsvistastyle])
150-
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
150+
AC_DEFINE([QT_QPA_PLATFORM_WINDOWS], [1], [Define this symbol if the qt platform is windows])
151151
elif test "x$TARGET_OS" = xlinux; then
152152
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb])
153-
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
153+
AC_DEFINE([QT_QPA_PLATFORM_XCB], [1], [Define this symbol if the qt platform is xcb])
154154
elif test "x$TARGET_OS" = xdarwin; then
155-
AX_CHECK_LINK_FLAG([[-framework Carbon]],[QT_LIBS="$QT_LIBS -framework Carbon"],[AC_MSG_ERROR(could not link against Carbon framework)])
156-
AX_CHECK_LINK_FLAG([[-framework IOSurface]],[QT_LIBS="$QT_LIBS -framework IOSurface"],[AC_MSG_ERROR(could not link against IOSurface framework)])
157-
AX_CHECK_LINK_FLAG([[-framework Metal]],[QT_LIBS="$QT_LIBS -framework Metal"],[AC_MSG_ERROR(could not link against Metal framework)])
158-
AX_CHECK_LINK_FLAG([[-framework QuartzCore]],[QT_LIBS="$QT_LIBS -framework QuartzCore"],[AC_MSG_ERROR(could not link against QuartzCore framework)])
155+
AX_CHECK_LINK_FLAG([-framework Carbon], [QT_LIBS="$QT_LIBS -framework Carbon"], [AC_MSG_ERROR(could not link against Carbon framework)])
156+
AX_CHECK_LINK_FLAG([-framework IOSurface], [QT_LIBS="$QT_LIBS -framework IOSurface"], [AC_MSG_ERROR(could not link against IOSurface framework)])
157+
AX_CHECK_LINK_FLAG([-framework Metal], [QT_LIBS="$QT_LIBS -framework Metal"], [AC_MSG_ERROR(could not link against Metal framework)])
158+
AX_CHECK_LINK_FLAG([-framework QuartzCore], [QT_LIBS="$QT_LIBS -framework QuartzCore"], [AC_MSG_ERROR(could not link against QuartzCore framework)])
159159
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QCocoaIntegrationPlugin], [-lqcocoa])
160160
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle])
161-
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
161+
AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the qt platform is cocoa])
162162
elif test "x$TARGET_OS" = xandroid; then
163163
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid${qt_lib_suffix} -ljnigraphics -landroid -lqtfreetype${qt_lib_suffix} $QT_LIBS"
164-
AC_DEFINE(QT_QPA_PLATFORM_ANDROID, 1, [Define this symbol if the qt platform is android])
164+
AC_DEFINE([QT_QPA_PLATFORM_ANDROID], [1], [Define this symbol if the qt platform is android])
165165
fi
166166
fi
167167
CPPFLAGS=$TEMP_CPPFLAGS
@@ -174,7 +174,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
174174
175175
if test "x$use_hardening" != xno; then
176176
BITCOIN_QT_CHECK([
177-
AC_MSG_CHECKING(whether -fPIE can be used with this Qt config)
177+
AC_MSG_CHECKING([whether -fPIE can be used with this Qt config])
178178
TEMP_CPPFLAGS=$CPPFLAGS
179179
TEMP_CXXFLAGS=$CXXFLAGS
180180
CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
@@ -190,15 +190,15 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
190190
choke
191191
#endif
192192
]])],
193-
[ AC_MSG_RESULT(yes); QT_PIE_FLAGS=$PIE_FLAGS ],
194-
[ AC_MSG_RESULT(no); QT_PIE_FLAGS=$PIC_FLAGS]
193+
[ AC_MSG_RESULT([yes]); QT_PIE_FLAGS=$PIE_FLAGS ],
194+
[ AC_MSG_RESULT([no]); QT_PIE_FLAGS=$PIC_FLAGS]
195195
)
196196
CPPFLAGS=$TEMP_CPPFLAGS
197197
CXXFLAGS=$TEMP_CXXFLAGS
198198
])
199199
else
200200
BITCOIN_QT_CHECK([
201-
AC_MSG_CHECKING(whether -fPIC is needed with this Qt config)
201+
AC_MSG_CHECKING([whether -fPIC is needed with this Qt config])
202202
TEMP_CPPFLAGS=$CPPFLAGS
203203
CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS"
204204
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -212,8 +212,8 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
212212
choke
213213
#endif
214214
]])],
215-
[ AC_MSG_RESULT(no)],
216-
[ AC_MSG_RESULT(yes); QT_PIE_FLAGS=$PIC_FLAGS]
215+
[ AC_MSG_RESULT([no])],
216+
[ AC_MSG_RESULT([yes]); QT_PIE_FLAGS=$PIC_FLAGS]
217217
)
218218
CPPFLAGS=$TEMP_CPPFLAGS
219219
])
@@ -247,12 +247,12 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
247247
BITCOIN_QT_CHECK([
248248
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
249249
base_frameworks="-framework Foundation -framework AppKit"
250-
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
250+
AX_CHECK_LINK_FLAG([$base_frameworks], [QT_LIBS="$QT_LIBS $base_frameworks"], [AC_MSG_ERROR(could not find base frameworks)])
251251
])
252252
;;
253253
*mingw*)
254254
BITCOIN_QT_CHECK([
255-
AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)])
255+
AX_CHECK_LINK_FLAG([-mwindows], [QT_LDFLAGS="$QT_LDFLAGS -mwindows"], [AC_MSG_WARN([-mwindows linker support not detected])])
256256
])
257257
esac
258258

‎ci/dash/build_depends.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ source ./ci/dash/matrix.sh
1414
unset CC; unset CXX
1515
unset DISPLAY
1616

17-
mkdir -p $CACHE_DIR/depends
18-
mkdir -p $CACHE_DIR/sdk-sources
17+
mkdir -p "$CACHE_DIR/depends"
18+
mkdir -p "$CACHE_DIR/sdk-sources"
1919

20-
ln -s $CACHE_DIR/depends ${DEPENDS_DIR}/built
21-
ln -s $CACHE_DIR/sdk-sources ${DEPENDS_DIR}/sdk-sources
20+
ln -s "$CACHE_DIR/depends" "${DEPENDS_DIR}/built"
21+
ln -s "$CACHE_DIR/sdk-sources" "${DEPENDS_DIR}/sdk-sources"
2222

2323
if [[ "${HOST}" == "x86_64-apple-darwin" ]]; then
2424
./contrib/containers/guix/scripts/setup-sdk
2525
fi
2626

27-
make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
27+
make "$MAKEJOBS" -C depends HOST="$HOST" "$DEP_OPTS"

‎ci/dash/build_src.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ source ./ci/dash/matrix.sh
1414
unset CC; unset CXX
1515
unset DISPLAY
1616

17-
if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh $COMMIT_RANGE; fi
17+
if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh "$COMMIT_RANGE"; fi
1818

1919
if [ "$CHECK_DOC" = 1 ]; then
2020
# TODO: Verify subtrees
@@ -28,7 +28,7 @@ if [ "$CHECK_DOC" = 1 ]; then
2828
test/lint/all-lint.py
2929
fi
3030

31-
ccache --zero-stats --max-size=$CCACHE_SIZE
31+
ccache --zero-stats --max-size="$CCACHE_SIZE"
3232

3333
if [ -n "$CONFIG_SHELL" ]; then
3434
export CONFIG_SHELL="$CONFIG_SHELL"
@@ -46,23 +46,23 @@ mkdir build-ci
4646
cd build-ci
4747

4848
bash -c "../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
49-
make distdir VERSION=$BUILD_TARGET
49+
make distdir VERSION="$BUILD_TARGET"
5050

51-
cd dashcore-$BUILD_TARGET
51+
cd "dashcore-$BUILD_TARGET"
5252
bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
5353

5454
if [ "${RUN_TIDY}" = "true" ]; then
5555
MAYBE_BEAR="bear --config src/.bear-tidy-config"
5656
MAYBE_TOKEN="--"
5757
fi
5858

59-
bash -c "${MAYBE_BEAR} ${MAYBE_TOKEN} make ${MAKEJOBS} ${GOAL}" || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
59+
bash -c "${MAYBE_BEAR} ${MAYBE_TOKEN} make ${MAKEJOBS} ${GOAL}" || ( echo "Build failure. Verbose build follows." && make "$GOAL" V=1 ; false )
6060

6161
ccache --version | head -n 1 && ccache --show-stats
6262

6363
if [ -n "$USE_VALGRIND" ]; then
6464
echo "valgrind in USE!"
65-
${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh
65+
"${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
6666
fi
6767

6868
if [ "${RUN_TIDY}" = "true" ]; then

0 commit comments

Comments
 (0)