From 3e8a78c8dceedb001587cb6c1eaa31cb8aa56729 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 19 Jun 2014 19:07:03 -0700 Subject: [PATCH] test: unit test for using alternate roots with path_strv_resolve --- src/test/test-path-util.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 9f8ae4dee..4ee33a954 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -20,10 +20,12 @@ ***/ #include +#include #include "path-util.h" #include "util.h" #include "macro.h" +#include "strv.h" static void test_path(void) { @@ -191,11 +193,40 @@ static void test_make_relative(void) { test("//extra/////slashes///won't////fool///anybody//", "////extra///slashes////are/just///fine///", "../../../are/just/fine"); } +static void test_strv_resolve(void) { + char tmp_dir[] = "/tmp/test-path-util-XXXXXX"; + _cleanup_strv_free_ char **search_dirs = NULL; + _cleanup_strv_free_ char **absolute_dirs = NULL; + char **d; + + assert_se(mkdtemp(tmp_dir) != NULL); + + search_dirs = strv_new("/dir1", "/dir2", "/dir3", NULL); + assert_se(search_dirs); + STRV_FOREACH(d, search_dirs) { + char *p = strappend(tmp_dir, *d); + assert_se(p); + assert_se(strv_push(&absolute_dirs, p) == 0); + } + + assert_se(mkdir(absolute_dirs[0], 0700) == 0); + assert_se(mkdir(absolute_dirs[1], 0700) == 0); + assert_se(symlink("dir2", absolute_dirs[2]) == 0); + + path_strv_resolve(search_dirs, tmp_dir); + assert_se(streq(search_dirs[0], "/dir1")); + assert_se(streq(search_dirs[1], "/dir2")); + assert_se(streq(search_dirs[2], "/dir2")); + + assert_se(rm_rf_dangerous(tmp_dir, false, true, false) == 0); +} + int main(int argc, char **argv) { test_path(); test_find_binary(argv[0]); test_prefixes(); test_fsck_exists(); test_make_relative(); + test_strv_resolve(); return 0; } -- 2.30.2