From 15f07f3172e69e87b1c6d3d03911e3dc38b0110c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 17 Jun 2017 12:37:16 -0400 Subject: basic/path-util: allow flags for path_equal_or_files_same No functional change, just a new parameters and the tests that AT_SYMLINK_NOFOLLOW works as expected. --- src/test/test-path-util.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'src/test/test-path-util.c') diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 72b931568..c27624b43 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -117,23 +117,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) { -- cgit v1.2.3