diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-05 20:01:03 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-05 20:02:41 +0800 |
| commit | 1e7564eca8a688f39c75540877ec3bdfdde766b1 (patch) | |
| tree | 62b5b333d1f6ff38e1aeea71825c4a776e2d455c /src/addrman.h | |
| parent | b23e0379610dde49e18c7e3e66edd23ebbcdcb45 (diff) | |
| parent | d216bc8d76d7f4e9dce58b0bb732a2d4deaf23b6 (diff) | |
Merge bitcoin/bitcoin#24251: Re-enable windows path tests disabled by #20744
d216bc8d76d7f4e9dce58b0bb732a2d4deaf23b6 Re-enable walletinit_verify_walletdir_no_trailing2 test disabled in #20744 (Ryan Ofsky)
80cd64e84296f1166e133c237fa0afc046b01ce2 Re-enable util_datadir check disabled in #20744 (Ryan Ofsky)
Pull request description:
Reenable some broken tests as discussed https://github.com/bitcoin/bitcoin/pull/20744#discussion_r798651736 and https://github.com/bitcoin/bitcoin/pull/20744#discussion_r798678137
Fix windows test cases broken in #20744, by passing normalized path arguments to fs::equivalent, fs::exists, and fs::is_directory, instead of non-normalized arguments. Also re-enable the tests.
It is possible these changes also fix real init behavior on windows when -datadir or -walletdir paths with trailing dots or dashes are used, but it's not clear because I only tested on wine.
ACKs for top commit:
hebasto:
ACK d216bc8d76d7f4e9dce58b0bb732a2d4deaf23b6, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 2099ddfa1a3ad70f7ac2ff413929414a1851d257b280da25c0f5cefb46fd1372b580a1f1ee5280681a1c16e6031f119185cadd4f7a6121298562cf001f711068
Diffstat (limited to 'src/addrman.h')
0 files changed, 0 insertions, 0 deletions