From: Mark Wielaard <mark@klomp.org>
Date: Thu, 19 Jan 2023 22:53:33 +0000 (+0100)
Subject: tests: run-debuginfod-query-retry.sh /bin/sh might not have a build-id
X-Git-Tag: elfutils-0.189~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba59ce28cbd62ee12128b89bc0601a38ceeb5aa8;p=thirdparty%2Felfutils.git

tests: run-debuginfod-query-retry.sh /bin/sh might not have a build-id

If /bin/sh wasn't build with build-id the test fails because
debuginfod-find will not be able to even try to fetch something.
Use libdebuginfod.so.1 instead as test file because we just
build that and configure makes sure we always produce a build-id.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8c841fa10..668078563 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2023-01-19  Mark Wielaard  <mark@klomp.org>
+
+	* run-debuginfod-query-retry.sh: Use libdebuginfod.so.1 instead
+	of /bin/sh as test file.
+
 2022-12-21  Shahab Vahedi  <shahab@synopsys.email>
 
 	* hello_arc_hs4.ko.bz2: New testfile.
diff --git a/tests/run-debuginfod-query-retry.sh b/tests/run-debuginfod-query-retry.sh
index 0cfdba92d..2f551ffbf 100755
--- a/tests/run-debuginfod-query-retry.sh
+++ b/tests/run-debuginfod-query-retry.sh
@@ -25,8 +25,9 @@ unset VALGRIND_CMD
 ########################################################################
 # set up tests for retrying failed queries.
 retry_attempts=`(testrun env DEBUGINFOD_URLS=http://255.255.255.255/JUNKJUNK DEBUGINFOD_RETRY_LIMIT=10 DEBUGINFOD_VERBOSE=1 DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache \
-        ${abs_top_builddir}/debuginfod/debuginfod-find debuginfo /bin/sh || true) 2>&1 >/dev/null \
-        | grep -c 'Retry failed query'`
+    ${abs_top_builddir}/debuginfod/debuginfod-find debuginfo \
+    ${abs_top_builddir}/debuginfod/libdebuginfod.so.1 || true) \
+    2>&1 >/dev/null | grep -c 'Retry failed query'`
 if [ $retry_attempts -ne 10 ]; then
     echo "retry mechanism failed."
     exit 1;