chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-path-util: fix a leak
[elogind.git]
/
src
/
test
/
test-path-util.c
diff --git
a/src/test/test-path-util.c
b/src/test/test-path-util.c
index 82090ce99f51d4d9b7c45e2d388938c492783c8b..58b456a29183da7116d40475cf9a0f00b80912b1 100644
(file)
--- a/
src/test/test-path-util.c
+++ b/
src/test/test-path-util.c
@@
-85,29
+85,32
@@
static void test_path(void) {
}
}
}
}
-static void test_find_binary(const char *self) {
+static void test_find_binary(const char *self
, bool local
) {
char *p;
char *p;
- assert_se(find_binary("/bin/sh", &p) == 0);
+ assert_se(find_binary("/bin/sh",
local,
&p) == 0);
puts(p);
assert_se(streq(p, "/bin/sh"));
free(p);
puts(p);
assert_se(streq(p, "/bin/sh"));
free(p);
- assert_se(find_binary(self, &p) == 0);
+ assert_se(find_binary(self,
local,
&p) == 0);
puts(p);
assert_se(endswith(p, "/test-path-util"));
assert_se(path_is_absolute(p));
free(p);
puts(p);
assert_se(endswith(p, "/test-path-util"));
assert_se(path_is_absolute(p));
free(p);
- assert_se(find_binary("sh", &p) == 0);
+ assert_se(find_binary("sh",
local,
&p) == 0);
puts(p);
assert_se(endswith(p, "/sh"));
assert_se(path_is_absolute(p));
free(p);
puts(p);
assert_se(endswith(p, "/sh"));
assert_se(path_is_absolute(p));
free(p);
- assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT);
+ assert_se(find_binary("xxxx-xxxx",
local,
&p) == -ENOENT);
- assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT);
+ assert_se(find_binary("/some/dir/xxxx-xxxx", local, &p) ==
+ (local ? -ENOENT : 0));
+ if (!local)
+ free(p);
}
static void test_prefixes(void) {
}
static void test_prefixes(void) {
@@
-263,7
+266,8
@@
static void test_path_startswith(void) {
int main(int argc, char **argv) {
test_path();
int main(int argc, char **argv) {
test_path();
- test_find_binary(argv[0]);
+ test_find_binary(argv[0], true);
+ test_find_binary(argv[0], false);
test_prefixes();
test_path_join();
test_fsck_exists();
test_prefixes();
test_path_join();
test_fsck_exists();