From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from csb.redhat.com (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id EB5C53858CDA for ; Thu, 19 Jan 2023 23:00:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB5C53858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: by csb.redhat.com (Postfix, from userid 10916) id DD3D9CB9DF; Fri, 20 Jan 2023 00:00:08 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Sam James , Mark Wielaard Subject: [COMMITTED] tests: run-debuginfod-query-retry.sh /bin/sh might not have a build-id Date: Fri, 20 Jan 2023 00:00:07 +0100 Message-Id: <20230119230007.322054-1-mark@klomp.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3035.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_BADIPHTTP,KAM_DMARC_STATUS,NORMAL_HTTP_TO_IP,NUMERIC_HTTP_ADDR,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-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 --- tests/ChangeLog | 5 +++++ tests/run-debuginfod-query-retry.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 8c841fa1..66807856 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2023-01-19 Mark Wielaard + + * run-debuginfod-query-retry.sh: Use libdebuginfod.so.1 instead + of /bin/sh as test file. + 2022-12-21 Shahab Vahedi * hello_arc_hs4.ko.bz2: New testfile. diff --git a/tests/run-debuginfod-query-retry.sh b/tests/run-debuginfod-query-retry.sh index 0cfdba92..2f551ffb 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; -- 2.31.1