projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tests: link libpause_consumer on liblttng-ctl
[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 44173f6f023e2c18ae8eb848ef15965c0978ca7c..d047c207dac0885afcbc0d9544bfbd1dd4c7b798 100644
(file)
--- a/
tests/unit/test_utils_expand_path.c
+++ b/
tests/unit/test_utils_expand_path.c
@@
-26,8
+26,7
@@
#include <tap/tap.h>
#include <tap/tap.h>
-#include <src/common/utils.h>
-
+#include <common/utils.h>
#include <common/common.h>
/* For error.h */
#include <common/common.h>
/* For error.h */
@@
-54,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" },
/* 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" },
{ "./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" },
@@
-281,8
+281,8
@@
error:
static void test_utils_expand_path(void)
{
char *result;
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++) {
/* Test valid cases */
for (i = 0; i < num_valid_tests; i++) {
@@
-295,14
+295,24
@@
static void test_utils_expand_path(void)
free(result);
}
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 */
/* 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",
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);
result = utils_expand_path(tmppath);
ok(result != NULL && strcmp(result + treelen,
symlink_tests_inputs[i].expected_result) == 0, name);
@@
-312,9
+322,12
@@
static void test_utils_expand_path(void)
/* Test invalid cases */
for (i = 0; i < num_invalid_tests; i++) {
/* 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);
}
if (result != NULL) {
free(result);
}
This page took
0.02533 seconds
and
4
git commands to generate.