diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e50e227491b..beb442495cf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -800,20 +800,20 @@ message("\n") message("Configure summary") message("=================") message("Executables:") -message(" bitcoind ............................ ${BUILD_DAEMON}") -message(" bitcoin-node (multiprocess) ......... ${WITH_MULTIPROCESS}") -message(" bitcoin-qt (GUI) .................... ${BUILD_GUI}") +message(" dashd ............................... ${BUILD_DAEMON}") +message(" dash-node (multiprocess) ............ ${WITH_MULTIPROCESS}") +message(" dash-qt (GUI) ....................... ${BUILD_GUI}") if(BUILD_GUI AND WITH_MULTIPROCESS) set(bitcoin_gui_status ON) else() set(bitcoin_gui_status OFF) endif() -message(" bitcoin-gui (GUI, multiprocess) ..... ${bitcoin_gui_status}") -message(" bitcoin-cli ......................... ${BUILD_CLI}") -message(" bitcoin-tx .......................... ${BUILD_TX}") -message(" bitcoin-util ........................ ${BUILD_UTIL}") -message(" bitcoin-wallet ...................... ${BUILD_WALLET_TOOL}") -message(" bitcoin-chainstate (experimental) ... ${BUILD_UTIL_CHAINSTATE}") +message(" dash-gui (GUI, multiprocess) ........ ${bitcoin_gui_status}") +message(" dash-cli ............................ ${BUILD_CLI}") +message(" dash-tx ............................. ${BUILD_TX}") +message(" dash-util ........................... ${BUILD_UTIL}") +message(" dash-wallet ......................... ${BUILD_WALLET_TOOL}") +message(" dash-chainstate (experimental) ...... ${BUILD_UTIL_CHAINSTATE}") message(" libdashconsensus .................... ${BUILD_CONSENSUS_LIB}") message("Optional features:") message(" wallet support ...................... ${ENABLE_WALLET}") @@ -834,9 +834,9 @@ message(" Dash Platform (GUI) ................. ${ENABLE_PLATFORM_GUI}") message(" stack traces ........................ ${ENABLE_STACKTRACES}") message(" crash hooks ......................... ${ENABLE_CRASH_HOOKS}") message("Tests:") -message(" test_bitcoin ........................ ${BUILD_TESTS}") -message(" test_bitcoin-qt ..................... ${BUILD_GUI_TESTS}") -message(" bench_bitcoin ....................... ${BUILD_BENCH}") +message(" test_dash ........................... ${BUILD_TESTS}") +message(" test_dash-qt ........................ ${BUILD_GUI_TESTS}") +message(" bench_dash .......................... ${BUILD_BENCH}") message(" fuzz binary ......................... ${BUILD_FUZZ_BINARY}") message("") if(CMAKE_CROSSCOMPILING) diff --git a/ci/dash/bundle-artifacts.sh b/ci/dash/bundle-artifacts.sh index e932ff5eeee2..9c0edf574acc 100755 --- a/ci/dash/bundle-artifacts.sh +++ b/ci/dash/bundle-artifacts.sh @@ -50,9 +50,7 @@ if [ "${VERB}" = "create" ]; then "src/test/fuzz/fuzz" "src/test/test_dash" ) - if [ "${BUILD_TARGET}" != "linux64_multiprocess" ]; then - EXCLUSIONS+=("src/qt/qrc_bitcoin.cpp" "src/qt/qrc_dash_locale.cpp") - else + if [ "${BUILD_TARGET}" = "linux64_multiprocess" ]; then # The lint job consumes the compilation database and generated sources. test -s "build-ci/dashcore-${BUILD_TARGET}/compile_commands.json" fi diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 6b2e658a7d4e..ef5f6222478d 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -121,8 +121,8 @@ What it does: * Fetch the target branch (the pull request's base by default) and the pull request. * Locally construct a merge commit. * Show the diff that merge results in. -* Ask you to verify the resulting source tree (so you can do a make -check or whatever). +* Ask you to verify the resulting source tree (so you can build and run `ctest` +or whatever). * Ask you whether to GPG sign the merge commit. * Ask you whether to push the result upstream. @@ -136,7 +136,7 @@ Setup Configuring the github-merge tool for the Dash Core repository is done in the following way: git config githubmerge.repository dashpay/dash - git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) + git config githubmerge.testcmd "cmake --build build -j4 && ctest --test-dir build -j4 --no-tests=error" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid Authentication (optional) diff --git a/contrib/devtools/check-no-rust.py b/contrib/devtools/check-no-rust.py index 04e5cff70435..42de3bd3c00b 100755 --- a/contrib/devtools/check-no-rust.py +++ b/contrib/devtools/check-no-rust.py @@ -14,7 +14,7 @@ Example usage: - contrib/devtools/check-no-rust.py src/dashd src/dash-cli src/dash-tx src/dash-util src/dash-wallet src/bench/bench_dash src/test/fuzz/fuzz + contrib/devtools/check-no-rust.py build/src/dashd build/src/dash-cli build/src/dash-tx build/src/dash-util build/src/dash-wallet build/src/bench/bench_dash build/src/test/fuzz/fuzz ''' import re import subprocess diff --git a/contrib/devtools/utxo_snapshot.sh b/contrib/devtools/utxo_snapshot.sh index c321c531e5be..73cffee16b91 100755 --- a/contrib/devtools/utxo_snapshot.sh +++ b/contrib/devtools/utxo_snapshot.sh @@ -18,8 +18,8 @@ if (( $# < 3 )); then echo echo 'Examples:' echo - echo " ./contrib/devtools/utxo_snapshot.sh 570000 utxo.dat ./src/dash-cli -datadir=\$(pwd)/testdata" - echo ' ./contrib/devtools/utxo_snapshot.sh 570000 - ./src/dash-cli' + echo " ./contrib/devtools/utxo_snapshot.sh 570000 utxo.dat ./build/src/dash-cli -datadir=\$(pwd)/testdata" + echo ' ./contrib/devtools/utxo_snapshot.sh 570000 - ./build/src/dash-cli' exit 1 fi diff --git a/contrib/tracing/README.md b/contrib/tracing/README.md index a6ad649b5ff3..dab86151d539 100644 --- a/contrib/tracing/README.md +++ b/contrib/tracing/README.md @@ -82,7 +82,7 @@ about the connection. Peers can be selected individually to view recent P2P messages. ``` -$ python3 contrib/tracing/p2p_monitor.py ./src/dashd +$ python3 contrib/tracing/p2p_monitor.py ./build/src/dashd ``` Lists selectable peers and traffic and connection information. @@ -150,7 +150,7 @@ lost. BCC prints: `Possibly lost 2 samples` on lost messages. ``` -$ python3 contrib/tracing/log_raw_p2p_msgs.py ./src/dashd +$ python3 contrib/tracing/log_raw_p2p_msgs.py ./build/src/dashd ``` ``` @@ -188,7 +188,7 @@ In a different terminal, starting Dash Core in DevNet mode and with re-indexing enabled. ``` -$ ./src/dashd -devnet -reindex +$ ./build/src/dashd -devnet -reindex ``` This produces the following output. @@ -241,7 +241,7 @@ A BCC Python script to log the UTXO cache flushes. Based on the `utxocache:flush` tracepoint. ```bash -$ python3 contrib/tracing/log_utxocache_flush.py ./src/dashd +$ python3 contrib/tracing/log_utxocache_flush.py ./build/src/dashd ``` ``` @@ -299,7 +299,7 @@ comprising a timestamp along with all event data available via the event's tracepoint. ```console -$ python3 contrib/tracing/mempool_monitor.py ./src/dashd +$ python3 contrib/tracing/mempool_monitor.py ./build/src/dashd ``` ``` diff --git a/contrib/tracing/connectblock_benchmark.bt b/contrib/tracing/connectblock_benchmark.bt index 14d79beb83be..a85bb19d148f 100755 --- a/contrib/tracing/connectblock_benchmark.bt +++ b/contrib/tracing/connectblock_benchmark.bt @@ -16,7 +16,7 @@ This script requires a 'dashd' binary compiled with eBPF support and the 'validation:block_connected' USDT. By default, it's assumed that 'dashd' is - located in './src/dashd'. This can be modified in the script below. + located in './build/src/dashd'. This can be modified in the script below. EXAMPLES: @@ -67,7 +67,7 @@ BEGIN connected block is between the start and end height (or the end height is unset). */ -usdt:./src/dashd:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 == 0 )/ +usdt:./build/src/dashd:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 == 0 )/ { $height = arg1; $transactions = arg2; @@ -102,7 +102,7 @@ usdt:./src/dashd:validation:block_connected /arg1 >= $1 && (arg1 <= $2 || $2 == blocks where the time it took to connect the block is above the . */ -usdt:./src/dashd:validation:block_connected / (uint64) arg5 / 1000> $3 / +usdt:./build/src/dashd:validation:block_connected / (uint64) arg5 / 1000> $3 / { $hash = arg0; $height = (int32) arg1; diff --git a/contrib/tracing/log_p2p_traffic.bt b/contrib/tracing/log_p2p_traffic.bt index f105dab368e2..c7f60bf72153 100755 --- a/contrib/tracing/log_p2p_traffic.bt +++ b/contrib/tracing/log_p2p_traffic.bt @@ -5,7 +5,7 @@ BEGIN printf("Logging P2P traffic\n") } -usdt:./src/dashd:net:inbound_message +usdt:./build/src/dashd:net:inbound_message { $peer_id = (int64) arg0; $peer_addr = str(arg1); @@ -15,7 +15,7 @@ usdt:./src/dashd:net:inbound_message printf("inbound '%s' msg from peer %d (%s, %s) with %d bytes\n", $msg_type, $peer_id, $peer_type, $peer_addr, $msg_len); } -usdt:./src/dashd:net:outbound_message +usdt:./build/src/dashd:net:outbound_message { $peer_id = (int64) arg0; $peer_addr = str(arg1); diff --git a/contrib/tracing/log_utxos.bt b/contrib/tracing/log_utxos.bt index 8be17a077159..e4e856742b38 100755 --- a/contrib/tracing/log_utxos.bt +++ b/contrib/tracing/log_utxos.bt @@ -8,7 +8,7 @@ This script requires a 'dashd' binary compiled with eBPF support and the 'utxocache' tracepoints. By default, it's assumed that 'dashd' is - located in './src/dashd'. This can be modified in the script below. + located in './build/src/dashd'. This can be modified in the script below. NOTE: requires bpftrace v0.12.0 or above. */ @@ -22,7 +22,7 @@ BEGIN /* Attaches to the 'utxocache:add' tracepoint and prints additions to the UTXO set cache. */ -usdt:./src/dashd:utxocache:add +usdt:./build/src/dashd:utxocache:add { $txid = arg0; $index = (uint32)arg1; @@ -44,7 +44,7 @@ usdt:./src/dashd:utxocache:add /* Attaches to the 'utxocache:spent' tracepoint and prints spents from the UTXO set cache. */ -usdt:./src/dashd:utxocache:spent +usdt:./build/src/dashd:utxocache:spent { $txid = arg0; $index = (uint32)arg1; @@ -66,7 +66,7 @@ usdt:./src/dashd:utxocache:spent /* Attaches to the 'utxocache:uncache' tracepoint and uncache UTXOs from the UTXO set cache. */ -usdt:./src/dashd:utxocache:uncache +usdt:./build/src/dashd:utxocache:uncache { $txid = arg0; $index = (uint32)arg1; diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index 04f13ca9b104..79462b1a0698 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -2,14 +2,14 @@ # dependencies that cannot be fixed in-tree. # # Example use: -# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_dash +# $ valgrind --suppressions=contrib/valgrind.supp build/src/test/test_dash # $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \ -# --show-leak-kinds=all src/test/test_dash +# --show-leak-kinds=all build/src/test/test_dash # # To create suppressions for found issues, use the --gen-suppressions=all option: # $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \ # --show-leak-kinds=all --gen-suppressions=all --show-reachable=yes \ -# --error-limit=no src/test/test_dash +# --error-limit=no build/src/test/test_dash # # Note that suppressions may depend on OS and/or library versions. # Tested on: