lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Enable dirOf test

Browse source 
Adjusted the doc comment for `dirOf` to reflect the implementation
behavior.
This commit is contained in:
Tobias Pflug 2020-05-08 15:03:44 +02:00
parent 5b8883faac
commit e3df9c2a6e
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,12 +86,10 @@ namespace nix {
* dirOf * dirOf
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
// XXX: according to the doc of `dirOf`, dirOf("/") and dirOf("/foo") TEST(dirOf, returnsEmptyStringForRoot) {
// should both return "" but it actually returns "/" in both cases
TEST(dirOf, DISABLED_returnsEmptyStringForRoot) {
auto p = dirOf("/"); auto p = dirOf("/");
ASSERT_EQ(p, ""); ASSERT_EQ(p, "/");
} }
TEST(dirOf, returnsFirstPathComponent) { TEST(dirOf, returnsFirstPathComponent) {

2
src/libutil/util.hh
View file

@ -58,7 +58,7 @@ Path canonPath(const Path & path, bool resolveSymlinks = false);
/* Return the directory part of the given canonical path, i.e., /* Return the directory part of the given canonical path, i.e.,
everything before the final `/'. If the path is the root or an everything before the final `/'. If the path is the root or an
immediate child thereof (e.g., `/foo'), this means an empty string immediate child thereof (e.g., `/foo'), this means `/'
is returned.*/ is returned.*/
Path dirOf(const Path & path); Path dirOf(const Path & path);