mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

test: Fix "false" subtest in system_tests for Windows

Browse Source
This commit is contained in:
Hennadii Stepanov 2021-12-15 13:59:08 +02:00
parent 507c009c1e
commit 0aad33db64
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/system_tests.cpp
View File

@ -37,12 +37,6 @@ bool checkMessage(const std::runtime_error& ex)
return true; return true;
} }
bool checkMessageFalse(const std::runtime_error& ex)
{
BOOST_CHECK_EQUAL(ex.what(), std::string("RunCommandParseJSON error: process(false) returned 1: \n"));
return true;
}
bool checkMessageStdErr(const std::runtime_error& ex) bool checkMessageStdErr(const std::runtime_error& ex)
{ {
const std::string what(ex.what()); const std::string what(ex.what());
@ -73,7 +67,15 @@ BOOST_AUTO_TEST_CASE(run_command)
} }
{ {
// Return non-zero exit code, no output to stderr // Return non-zero exit code, no output to stderr
BOOST_CHECK_EXCEPTION(RunCommandParseJSON("false"), std::runtime_error, checkMessageFalse); #ifdef WIN32
const std::string command{"cmd.exe /c call"};
#else
const std::string command{"false"};
#endif
BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
BOOST_CHECK(std::string(e.what()).find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
return true;
});
} }
{ {
// Return non-zero exit code, with error message for stderr // Return non-zero exit code, with error message for stderr