From: Mike Gilbert <floppymaster@gmail.com>
Date: Mon, 1 Aug 2016 01:50:50 +0000 (-0400)
Subject: test-path-util: check for /lt-test-path-util or /test-path-util (#3841)
X-Git-Tag: v232~357
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d1e2ddd59f929ce98e400cb14fba7a873e2b409;p=thirdparty%2Fsystemd.git

test-path-util: check for /lt-test-path-util or /test-path-util (#3841)

Depending on how binutils was configured and the --enable-fast-install
configure option, the test binary might be called either name.

Fixes: https://github.com/systemd/systemd/issues/3838
---

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 6094d4c3e5a..164a10d8a88 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -114,7 +114,8 @@ static void test_find_binary(const char *self) {
 
         assert_se(find_binary(self, &p) == 0);
         puts(p);
-        assert_se(endswith(p, "/lt-test-path-util"));
+        /* libtool might prefix the binary name with "lt-" */
+        assert_se(endswith(p, "/lt-test-path-util") || endswith(p, "/test-path-util"));
         assert_se(path_is_absolute(p));
         free(p);