kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Enable baseNameOf test

Browse source 
Add note about removal of trailing slashes in the doc comment of
baseNameOf and enabled the test.
This commit is contained in:
Tobias Pflug 2020-05-08 15:07:40 +02:00
parent e3df9c2a6e
commit 2191141274
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/tests/tests.cc
View file

@ -127,11 +127,9 @@ namespace nix {
ASSERT_EQ(p1, ""); ASSERT_EQ(p1, "");
} }
// XXX: according to the doc of `baseNameOf`, baseNameOf("/dir/") should return TEST(baseNameOf, trailingSlash) {
// "" but it actually returns "dir"
TEST(baseNameOf, DISABLED_trailingSlash) {
auto p1 = baseNameOf("/dir/"); auto p1 = baseNameOf("/dir/");
ASSERT_EQ(p1, ""); ASSERT_EQ(p1, "dir");
} }
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------

2
src/libutil/util.hh
View file

@ -63,7 +63,7 @@ Path canonPath(const Path & path, bool resolveSymlinks = false);
Path dirOf(const Path & path); Path dirOf(const Path & path);
/* Return the base name of the given canonical path, i.e., everything /* Return the base name of the given canonical path, i.e., everything
following the final `/'. */ following the final `/' (trailing slashes are removed). */
std::string_view baseNameOf(std::string_view path); std::string_view baseNameOf(std::string_view path);
/* Check whether 'path' is a descendant of 'dir'. */ /* Check whether 'path' is a descendant of 'dir'. */