Add Unit test to poll compatibility layer

[lttng-tools.git] / tests / unit / test_utils_expand_path.c

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index e32f37753915c2cbeab040728084a170a0051d94..d047c207dac0885afcbc0d9544bfbd1dd4c7b798 100644 (file)
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -27,8 +26,7 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
-
+#include <common/utils.h>
 #include <common/common.h>
 
 /* For error.h */
@@ -55,6 +53,7 @@ struct symlink_test_input {
 /* Valid test cases */
 static struct valid_test_input valid_tests_inputs[] = {
        { "/a/b/c/d/e",                 "",             "/a/b/c/d/e"    },
+       { "/a//b//c/d/e",               "",             "/a/b/c/d/e"    },
        { "./a/b/c/d/e",                ".",            "/a/b/c/d/e"    },
        { "../a/b/c/d/../e",            "..",           "/a/b/c/e"      },
        { ".././a/b/c/d/./e",           "..",           "/a/b/c/d/e"    },
@@ -128,7 +127,7 @@ static void printerr(char *msg)
        fprintf(stderr, "test_utils_expand_path: error: %s\n", msg);
 }
 
-int prepare_valid_results()
+int prepare_valid_results(void)
 {
        int i;
        char *relative, *cur_path = NULL, *prev_path = NULL,
@@ -184,7 +183,7 @@ end:
        return ret;
 }
 
-int free_valid_results()
+int free_valid_results(void)
 {
        int i;
 
@@ -197,7 +196,7 @@ int free_valid_results()
        return 0;
 }
 
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -238,7 +237,7 @@ error:
        return 1;
 }
 
-int free_symlink_tree()
+int free_symlink_tree(void)
 {
        int i;
        char tmppath[PATH_MAX];
@@ -282,8 +281,8 @@ error:
 static void test_utils_expand_path(void)
 {
        char *result;
-       char name[100], tmppath[PATH_MAX];
-       int i;
+       char name[100], tmppath[PATH_MAX], real_tree_origin[PATH_MAX];
+       int i, treelen;
 
        /* Test valid cases */
        for (i = 0; i < num_valid_tests; i++) {
@@ -296,14 +295,24 @@ static void test_utils_expand_path(void)
                free(result);
        }
 
+       /*
+        * Get the realpath for the tree_origin since it can itself be a
+        * symlink.
+        */
+       result = realpath(tree_origin, real_tree_origin);
+       if (!result) {
+               fail("realpath failed.");
+               return;
+       }
+
        /* Test symlink tree cases */
-       int treelen = strlen(tree_origin) + 1;
+       treelen = strlen(real_tree_origin) + 1;
        for (i = 0; i < num_symlink_tests; i++) {
                sprintf(name, "symlink tree test case: [tmppath/]%s",
                                symlink_tests_inputs[i].input);
 
                snprintf(tmppath, PATH_MAX, "%s/%s",
-                               tree_origin, symlink_tests_inputs[i].input);
+                               real_tree_origin, symlink_tests_inputs[i].input);
                result = utils_expand_path(tmppath);
                ok(result != NULL && strcmp(result + treelen,
                                        symlink_tests_inputs[i].expected_result) == 0, name);
@@ -313,9 +322,12 @@ static void test_utils_expand_path(void)
 
        /* Test invalid cases */
        for (i = 0; i < num_invalid_tests; i++) {
-               sprintf(name, "invalid test case: %s", invalid_tests_inputs[i]);
+               const char *test_input = invalid_tests_inputs[i];
+
+               sprintf(name, "invalid test case: %s", test_input ?
+                               test_input : "NULL");
 
-               result = utils_expand_path(invalid_tests_inputs[i]);
+               result = utils_expand_path(test_input);
                if (result != NULL) {
                        free(result);
                }