diff options
| -rw-r--r-- | src/test/util_tests.cpp | 3 | ||||
| -rw-r--r-- | src/util/system.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index b6479efe7d..52b24327ec 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -71,12 +71,9 @@ BOOST_AUTO_TEST_CASE(util_datadir) args.ClearPathCache(); BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase()); -#ifndef WIN32 - // Windows does not consider "datadir/.//" to be a valid directory path. args.ForceSetArg("-datadir", fs::PathToString(dd_norm) + "/.//"); args.ClearPathCache(); BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase()); -#endif } BOOST_AUTO_TEST_CASE(util_check) diff --git a/src/util/system.cpp b/src/util/system.cpp index 0ee63f6381..8d0cec249d 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -253,7 +253,7 @@ fs::path StripRedundantLastElementsOfPath(const fs::path& path) result = result.parent_path(); } - assert(fs::equivalent(result, path)); + assert(fs::equivalent(result, path.lexically_normal())); return result; } } // namespace |