projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add utils_expand_path_keep_symlink fonction
[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..d5cab002e9096ade325d9cc820586aec96f75442 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.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
#include <string.h>
#include <stdio.h>
@@
-27,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 */
@@
-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" },
/* 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" },
@@
-128,7
+127,7
@@
static void printerr(char *msg)
fprintf(stderr, "test_utils_expand_path: error: %s\n", 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,
{
int i;
char *relative, *cur_path = NULL, *prev_path = NULL,
@@
-184,7
+183,7
@@
end:
return ret;
}
return ret;
}
-int free_valid_results()
+int free_valid_results(
void
)
{
int i;
{
int i;
@@
-197,7
+196,7
@@
int free_valid_results()
return 0;
}
return 0;
}
-int prepare_symlink_tree()
+int prepare_symlink_tree(
void
)
{
int i;
char tmppath[PATH_MAX];
{
int i;
char tmppath[PATH_MAX];
@@
-238,7
+237,7
@@
error:
return 1;
}
return 1;
}
-int free_symlink_tree()
+int free_symlink_tree(
void
)
{
int i;
char tmppath[PATH_MAX];
{
int i;
char tmppath[PATH_MAX];
@@
-313,9
+312,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.025137 seconds
and
5
git commands to generate.