X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=64f37a2cf01f0a4c25f180b13b57fa5ee0ba6e27;hb=b0118a799cb47c331d976d9d43ce0c5130b13cdc;hp=72b931568d004fcbc963fed55c0a076ce196d63f;hpb=9045f431a2a7d05a3a897829eb2c2f0b77edd2be;p=elogind.git diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 72b931568..64f37a2cf 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -27,6 +27,7 @@ #include "mount-util.h" #include "path-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "util.h" @@ -117,23 +118,33 @@ static void test_path_equal_root(void) { /* Make sure that files_same works as expected. */ - assert_se(files_same("/", "/") > 0); - assert_se(files_same("/", "//") > 0); + assert_se(files_same("/", "/", 0) > 0); + assert_se(files_same("/", "/", AT_SYMLINK_NOFOLLOW) > 0); + assert_se(files_same("/", "//", 0) > 0); + assert_se(files_same("/", "//", AT_SYMLINK_NOFOLLOW) > 0); - assert_se(files_same("/", "/./") > 0); - assert_se(files_same("/", "/../") > 0); + assert_se(files_same("/", "/./", 0) > 0); + assert_se(files_same("/", "/./", AT_SYMLINK_NOFOLLOW) > 0); + assert_se(files_same("/", "/../", 0) > 0); + assert_se(files_same("/", "/../", AT_SYMLINK_NOFOLLOW) > 0); - assert_se(files_same("/", "/.../") == -ENOENT); + assert_se(files_same("/", "/.../", 0) == -ENOENT); + assert_se(files_same("/", "/.../", AT_SYMLINK_NOFOLLOW) == -ENOENT); /* The same for path_equal_or_files_same. */ - assert_se(path_equal_or_files_same("/", "/")); - assert_se(path_equal_or_files_same("/", "//")); + assert_se(path_equal_or_files_same("/", "/", 0)); + assert_se(path_equal_or_files_same("/", "/", AT_SYMLINK_NOFOLLOW)); + assert_se(path_equal_or_files_same("/", "//", 0)); + assert_se(path_equal_or_files_same("/", "//", AT_SYMLINK_NOFOLLOW)); - assert_se(path_equal_or_files_same("/", "/./")); - assert_se(path_equal_or_files_same("/", "/../")); + assert_se(path_equal_or_files_same("/", "/./", 0)); + assert_se(path_equal_or_files_same("/", "/./", AT_SYMLINK_NOFOLLOW)); + assert_se(path_equal_or_files_same("/", "/../", 0)); + assert_se(path_equal_or_files_same("/", "/../", AT_SYMLINK_NOFOLLOW)); - assert_se(!path_equal_or_files_same("/", "/.../")); + assert_se(!path_equal_or_files_same("/", "/.../", 0)); + assert_se(!path_equal_or_files_same("/", "/.../", AT_SYMLINK_NOFOLLOW)); } static void test_find_binary(const char *self) {