summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-04-16 22:04:31 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-04-16 22:04:48 -0400
commit7f076504b8291d03063ccaee5b40f642df48f8b1 (patch)
treec323f8b5c228552411046ec31114bef2815ec79d
parent2e573fcf8754fdfe0db0a783b1631ec1679b063a (diff)
test-path-util: fix running with separate build dir
test-path-utils attempts to find itself, but if the binary is not in current directory, the test would fail.
-rw-r--r--src/test/test-path-util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 527b275656..0aa0bf1354 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -83,7 +83,7 @@ static void test_path(void) {
}
}
-static void test_find_binary(void) {
+static void test_find_binary(const char *self) {
char *p;
assert(find_binary("/bin/sh", &p) == 0);
@@ -91,7 +91,7 @@ static void test_find_binary(void) {
assert(streq(p, "/bin/sh"));
free(p);
- assert(find_binary("./test-path-util", &p) == 0);
+ assert(find_binary(self, &p) == 0);
puts(p);
assert(endswith(p, "/test-path-util"));
assert(path_is_absolute(p));
@@ -170,9 +170,9 @@ static void test_fsck_exists(void) {
assert_se(fsck_exists("AbCdE") == -ENOENT);
}
-int main(void) {
+int main(int argc, char **argv) {
test_path();
- test_find_binary();
+ test_find_binary(argv[0]);
test_prefixes();
test_fsck_exists();
return 0;