From a4324ce09546d80ab847dbfce715f015139ed593 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 21 Jan 2026 18:57:03 +0000 Subject: [PATCH 1/2] test: Remove `system_tests/run_command` runtime dependencies --- src/test/CMakeLists.txt | 3 +++ src/test/mock_process.cpp | 40 ++++++++++++++++++++++++++++++++++++++ src/test/system_tests.cpp | 39 ++++++++++++++----------------------- test/lint/lint-includes.py | 1 + 4 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 src/test/mock_process.cpp diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index d5f2776a4d8..0bfcc244551 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -61,6 +61,7 @@ add_executable(test_bitcoin miniminer_tests.cpp miniscript_tests.cpp minisketch_tests.cpp + mock_process.cpp multisig_tests.cpp bip328_tests.cpp net_peer_connection_tests.cpp @@ -188,6 +189,8 @@ function(add_boost_test source_file) list(TRANSFORM test_suite_macro REPLACE "(BOOST_FIXTURE_TEST_SUITE|BOOST_AUTO_TEST_SUITE)\\(" "" ) + # The mock_process test suite does not contain unit tests. + list(REMOVE_ITEM test_suite_macro "mock_process") foreach(test_suite_name IN LISTS test_suite_macro) add_test(NAME ${test_suite_name} COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- DEBUG_LOG_OUT diff --git a/src/test/mock_process.cpp b/src/test/mock_process.cpp new file mode 100644 index 00000000000..c9100c9fe0d --- /dev/null +++ b/src/test/mock_process.cpp @@ -0,0 +1,40 @@ +// Copyright (c) 2025-present The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or https://opensource.org/license/mit/. + +#include + +#include +#include + +BOOST_AUTO_TEST_SUITE(mock_process, *boost::unit_test::disabled()) + +BOOST_AUTO_TEST_CASE(valid_json, *boost::unit_test::disabled()) +{ + std::cout << R"({"success": true})" << std::endl; +} + +BOOST_AUTO_TEST_CASE(nonzeroexit_nooutput, *boost::unit_test::disabled()) +{ + BOOST_FAIL("Test unconditionally fails."); +} + +BOOST_AUTO_TEST_CASE(nonzeroexit_stderroutput, *boost::unit_test::disabled()) +{ + std::cerr << "err\n"; + BOOST_FAIL("Test unconditionally fails."); +} + +BOOST_AUTO_TEST_CASE(invalid_json, *boost::unit_test::disabled()) +{ + std::cout << "{\n"; +} + +BOOST_AUTO_TEST_CASE(pass_stdin_to_stdout, *boost::unit_test::disabled()) +{ + std::string s; + std::getline(std::cin, s); + std::cout << s << std::endl; +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index f4490dec0a5..c5eac1cbcd2 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -14,12 +14,20 @@ #include #endif // ENABLE_EXTERNAL_SIGNER +#include #include +#include + BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup) #ifdef ENABLE_EXTERNAL_SIGNER +static std::vector mock_executable(std::string name) +{ + return {boost::unit_test::framework::master_test_suite().argv[0], "--log_level=nothing", "--report_level=no", "--run_test=mock_process/" + name}; +} + BOOST_AUTO_TEST_CASE(run_command) { { @@ -27,11 +35,7 @@ BOOST_AUTO_TEST_CASE(run_command) BOOST_CHECK(result.isNull()); } { -#ifdef WIN32 - const UniValue result = RunCommandParseJSON({"cmd.exe", "/c", "echo", "{\"success\":", "true}"}); // The command is intentionally split "incorrectly", to exactly preserve previous behavior. This is due to the cmd.exe internal echo quoting strings with spaces in it, unlike the normal 'echo' below. -#else - const UniValue result = RunCommandParseJSON({"echo", "{\"success\": true}"}); -#endif + const UniValue result = RunCommandParseJSON(mock_executable("valid_json")); BOOST_CHECK(result.isObject()); const UniValue& success = result.find_value("success"); BOOST_CHECK(!success.isNull()); @@ -48,45 +52,32 @@ BOOST_AUTO_TEST_CASE(run_command) } { // Return non-zero exit code, no output to stderr -#ifdef WIN32 - const std::vector command = {"cmd.exe", "/c", "exit 1"}; -#else - const std::vector command = {"false"}; -#endif + const std::vector command = mock_executable("nonzeroexit_nooutput"); BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) { const std::string what{e.what()}; - BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", util::Join(command, " "))) != std::string::npos); + BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %d: \n", util::Join(command, " "), boost::exit_test_failure)) != std::string::npos); return true; }); } { // Return non-zero exit code, with error message for stderr -#ifdef WIN32 - const std::vector command = {"cmd.exe", "/c", "echo err 1>&2 && exit 1"}; -#else - const std::vector command = {"sh", "-c", "echo err 1>&2 && false"}; -#endif + const std::vector command = mock_executable("nonzeroexit_stderroutput"); const std::string expected{"err"}; BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) { const std::string what(e.what()); - BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %s: %s", util::Join(command, " "), 1, "err")) != std::string::npos); + BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned %s: %s", util::Join(command, " "), boost::exit_test_failure, "err")) != std::string::npos); BOOST_CHECK(what.find(expected) != std::string::npos); return true; }); } { // Unable to parse JSON -#ifdef WIN32 - const std::vector command = {"cmd.exe", "/c", "echo {"}; -#else - const std::vector command = {"echo", "{"}; -#endif - BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, HasReason("Unable to parse JSON: {")); + BOOST_CHECK_EXCEPTION(RunCommandParseJSON(mock_executable("invalid_json")), std::runtime_error, HasReason("Unable to parse JSON: {")); } #ifndef WIN32 { // Test stdin - const UniValue result = RunCommandParseJSON({"cat"}, "{\"success\": true}"); + const UniValue result = RunCommandParseJSON(mock_executable("pass_stdin_to_stdout"), "{\"success\": true}"); BOOST_CHECK(result.isObject()); const UniValue& success = result.find_value("success"); BOOST_CHECK(!success.isNull()); diff --git a/test/lint/lint-includes.py b/test/lint/lint-includes.py index cccaec73f10..70c4e0e2e2f 100755 --- a/test/lint/lint-includes.py +++ b/test/lint/lint-includes.py @@ -21,6 +21,7 @@ EXCLUDED_DIRS = ["contrib/devtools/bitcoin-tidy/", ] + SHARED_EXCLUDED_SUBTREES EXPECTED_BOOST_INCLUDES = [ + "boost/cstdlib.hpp", "boost/multi_index/detail/hash_index_iterator.hpp", "boost/multi_index/hashed_index.hpp", "boost/multi_index/identity.hpp", From 97e7e79435c69e90cb7f056c704c275421bf0892 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 21 Jan 2026 19:07:52 +0000 Subject: [PATCH 2/2] test: Enable `system_tests/run_command` "stdin" test on Windows --- src/test/system_tests.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index c5eac1cbcd2..5f88490eda1 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -74,7 +74,6 @@ BOOST_AUTO_TEST_CASE(run_command) // Unable to parse JSON BOOST_CHECK_EXCEPTION(RunCommandParseJSON(mock_executable("invalid_json")), std::runtime_error, HasReason("Unable to parse JSON: {")); } -#ifndef WIN32 { // Test stdin const UniValue result = RunCommandParseJSON(mock_executable("pass_stdin_to_stdout"), "{\"success\": true}"); @@ -83,7 +82,6 @@ BOOST_AUTO_TEST_CASE(run_command) BOOST_CHECK(!success.isNull()); BOOST_CHECK_EQUAL(success.get_bool(), true); } -#endif } #endif // ENABLE_EXTERNAL_SIGNER