Skip to content

Commit 3645e4c

Browse files
committed
Add missing newline in util_ChainMerge test
This was causing a lot of test cases not not be very meaningful because multiple configuration options were combined into one line. The changes in test output with this fix make sense and look like: ```diff - testnet=1 regtest=1 || test + testnet=1 regtest=1 || error: Invalid combination of -regtest, -testnet and -chain. Can use at most one. ``` Issue was reported and debugged by Wladimir J. van der Laan <[email protected]> in bitcoin/bitcoin#17385 (comment)
1 parent d9a4550 commit 3645e4c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/test/util_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ BOOST_FIXTURE_TEST_CASE(util_ChainMerge, ChainMergeTestingSetup)
890890
desc += " ";
891891
desc += argstr + 1;
892892
conf += argstr + 1;
893+
conf += "\n";
893894
}
894895
std::istringstream conf_stream(conf);
895896
BOOST_CHECK(parser.ReadConfigStream(conf_stream, "filepath", error));
@@ -928,7 +929,7 @@ BOOST_FIXTURE_TEST_CASE(util_ChainMerge, ChainMergeTestingSetup)
928929
// Results file is formatted like:
929930
//
930931
// <input> || <output>
931-
BOOST_CHECK_EQUAL(out_sha_hex, "94b4ad55c8ac639a56b93e36f7e32e4c611fd7d7dd7b2be6a71707b1eadcaec7");
932+
BOOST_CHECK_EQUAL(out_sha_hex, "f0b3a3c29869edc765d579c928f7f1690a71fbb673b49ccf39cbc4de18156a0d");
932933
}
933934

934935
BOOST_AUTO_TEST_CASE(util_FormatMoney)

0 commit comments

Comments
 (0)