From fa4e4bf4df0c202f518c313f75287caa513da77d Mon Sep 17 00:00:00 2001
From: Dan Nicholson <nicholson@endlessm.com>
Date: Thu, 4 May 2017 14:58:07 -0500
Subject: [PATCH] tests: Look for trivial-httpd in $libexecdir

Since b825aac, trivial-httpd is in $libexecdir/libostree by default and
not available through the ostree runner in PATH. Try to adjust find it
when running the tests installed.

Closes: #837
Approved by: dbnicholson
---
 tests/libtest.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/libtest.sh b/tests/libtest.sh
index 8127982d..3ce718f9 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -105,7 +105,15 @@ fi
 if test -n "${OSTREE_UNINSTALLED:-}"; then
     OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
 else
-    OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
+    # trivial-httpd is now in $libexecdir by default, which we don't
+    # know at this point. Fortunately, libtest.sh is also in
+    # $libexecdir, so make an educated guess. If it's not found, assume
+    # it's still runnable as "ostree trivial-httpd".
+    if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then
+        OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd"
+    else
+        OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
+    fi
 fi
 
 assert_files_hardlinked() {