From patchwork Thu Nov 11 14:46:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 47477 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 52DF43858037 for ; Thu, 11 Nov 2021 14:46:44 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 32C82385840A for ; Thu, 11 Nov 2021 14:46:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 32C82385840A 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: from reform (deer0x16.wildebeest.org [172.31.17.152]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id EC951302FBAB; Thu, 11 Nov 2021 15:46:33 +0100 (CET) Received: by reform (Postfix, from userid 1000) id 98B362E83628; Thu, 11 Nov 2021 15:46:33 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Subject: [PATCH] tests: Don't set DEBUGINFOD_TIMEOUT Date: Thu, 11 Nov 2021 15:46:26 +0100 Message-Id: <20211111144626.550735-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_BADIPHTTP, KAM_DMARC_STATUS, NUMERIC_HTTP_ADDR, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , Cc: Mark Wielaard Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" Various tests set DEBUGINFOD_TIMEOUT to 10. Which is less than the default of 90. None of the tests relied on a lower timeout. So just don't set it. Signed-off-by: Mark Wielaard --- tests/ChangeLog | 16 ++++++++++++++++ tests/run-debuginfod-000-permission.sh | 3 --- tests/run-debuginfod-archive-groom.sh | 1 - tests/run-debuginfod-archive-rename.sh | 1 - tests/run-debuginfod-archive-test.sh | 1 - tests/run-debuginfod-artifact-running.sh | 3 --- tests/run-debuginfod-dlopen.sh | 3 --- tests/run-debuginfod-extraction.sh | 3 --- tests/run-debuginfod-federation-link.sh | 1 - tests/run-debuginfod-federation-metrics.sh | 1 - tests/run-debuginfod-federation-sqlite.sh | 1 - tests/run-debuginfod-malformed.sh | 3 --- tests/run-debuginfod-tmp-home.sh | 3 --- tests/run-debuginfod-writable.sh | 3 --- 14 files changed, 16 insertions(+), 27 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index a59cdd51..26a4d674 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,19 @@ +2021-11-11 Mark Wielaard + + * run-debuginfod-000-permission.sh: Don't set DEBUGINFOD_TIMEOUT. + * run-debuginfod-archive-groom.sh: Likewise. + * run-debuginfod-archive-rename.sh: Likewise. + * run-debuginfod-archive-test.sh: Likewise. + * run-debuginfod-artifact-running.sh: Likewise. + * run-debuginfod-dlopen.sh: Likewise. + * run-debuginfod-extraction.sh: Likewise. + * run-debuginfod-federation-link.sh: Likewise. + * run-debuginfod-federation-metrics.sh: Likewise. + * run-debuginfod-federation-sqlite.sh: Likewise. + * run-debuginfod-malformed.sh: Likewise. + * run-debuginfod-tmp-home.sh: Likewise. + * run-debuginfod-writable.sh: Likewise. + 2021-11-05 Frank Ch. Eigler PR28430 diff --git a/tests/run-debuginfod-000-permission.sh b/tests/run-debuginfod-000-permission.sh index c1b2cf81..1f46c341 100755 --- a/tests/run-debuginfod-000-permission.sh +++ b/tests/run-debuginfod-000-permission.sh @@ -37,9 +37,6 @@ errfiles vlog$PORT1 wait_ready $PORT1 'ready' 1 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/ # or without trailing / -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' | grep groom ps -q $PID1 -e -L -o '%p %c %a' | grep scan diff --git a/tests/run-debuginfod-archive-groom.sh b/tests/run-debuginfod-archive-groom.sh index 030e0aa6..e2c394ef 100755 --- a/tests/run-debuginfod-archive-groom.sh +++ b/tests/run-debuginfod-archive-groom.sh @@ -28,7 +28,6 @@ get_ports DB=${PWD}/.debuginfod_tmp.sqlite tempfiles $DB export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache -export DEBUGINFOD_TIMEOUT=10 # Clean old dirictories mkdir R ${PWD}/F diff --git a/tests/run-debuginfod-archive-rename.sh b/tests/run-debuginfod-archive-rename.sh index 5369949b..a1a6cc1e 100755 --- a/tests/run-debuginfod-archive-rename.sh +++ b/tests/run-debuginfod-archive-rename.sh @@ -27,7 +27,6 @@ base=8200 get_ports DB=${PWD}/.debuginfod_tmp.sqlite export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache -export DEBUGINFOD_TIMEOUT=10 tempfiles $DEBUGINFOD_CACHE_PATH $DB # Clean old dirictories mkdir R ${PWD}/F diff --git a/tests/run-debuginfod-archive-test.sh b/tests/run-debuginfod-archive-test.sh index 9f7454bc..5f24ea71 100755 --- a/tests/run-debuginfod-archive-test.sh +++ b/tests/run-debuginfod-archive-test.sh @@ -42,7 +42,6 @@ wait_ready $PORT1 'ready' 1 wait_ready $PORT1 'thread_work_total{role="traverse"}' 1 # Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 export DEBUGINFOD_URLS='http://127.0.0.1:'$PORT1 # Check thread comm names diff --git a/tests/run-debuginfod-artifact-running.sh b/tests/run-debuginfod-artifact-running.sh index b9444426..8b9aed37 100755 --- a/tests/run-debuginfod-artifact-running.sh +++ b/tests/run-debuginfod-artifact-running.sh @@ -53,9 +53,6 @@ mv prog F mv prog.debug F tempfiles prog/F -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - kill -USR1 $PID1 wait_ready $PORT1 'thread_work_total{role="traverse"}' 2 wait_ready $PORT1 'thread_work_pending{role="scan"}' 0 diff --git a/tests/run-debuginfod-dlopen.sh b/tests/run-debuginfod-dlopen.sh index 39ee5190..7279b02e 100755 --- a/tests/run-debuginfod-dlopen.sh +++ b/tests/run-debuginfod-dlopen.sh @@ -42,9 +42,6 @@ errfiles vlog$PORT1 wait_ready $PORT1 'ready' 1 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/ # or without trailing / -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' ps -q $PID1 -e -L -o '%p %c %a' | grep groom diff --git a/tests/run-debuginfod-extraction.sh b/tests/run-debuginfod-extraction.sh index 06f60e78..a3722c90 100755 --- a/tests/run-debuginfod-extraction.sh +++ b/tests/run-debuginfod-extraction.sh @@ -39,9 +39,6 @@ errfiles vlog$PORT1 # Server must become ready wait_ready $PORT1 'ready' 1 -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' | grep groom ps -q $PID1 -e -L -o '%p %c %a' | grep scan diff --git a/tests/run-debuginfod-federation-link.sh b/tests/run-debuginfod-federation-link.sh index 1347e7b8..4f043741 100755 --- a/tests/run-debuginfod-federation-link.sh +++ b/tests/run-debuginfod-federation-link.sh @@ -24,7 +24,6 @@ unset VALGRIND_CMD DB=${PWD}/.debuginfod_tmp.sqlite export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache -export DEBUGINFOD_TIMEOUT=10 tempfiles $DB # Clean old dirictories diff --git a/tests/run-debuginfod-federation-metrics.sh b/tests/run-debuginfod-federation-metrics.sh index 2d0fd6d4..3da457e8 100755 --- a/tests/run-debuginfod-federation-metrics.sh +++ b/tests/run-debuginfod-federation-metrics.sh @@ -24,7 +24,6 @@ unset VALGRIND_CMD DB=${PWD}/.debuginfod_tmp.sqlite export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache -export DEBUGINFOD_TIMEOUT=10 export DEBUGINFOD_URLS='http://127.0.0.1:0' # Note invalid, will trigger error_count metric tempfiles $DB # Clean old dirictories diff --git a/tests/run-debuginfod-federation-sqlite.sh b/tests/run-debuginfod-federation-sqlite.sh index 45761ed7..449df5db 100755 --- a/tests/run-debuginfod-federation-sqlite.sh +++ b/tests/run-debuginfod-federation-sqlite.sh @@ -24,7 +24,6 @@ unset VALGRIND_CMD DB=${PWD}/.debuginfod_tmp.sqlite export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache -export DEBUGINFOD_TIMEOUT=10 tempfiles $DB # Clean old dirictories diff --git a/tests/run-debuginfod-malformed.sh b/tests/run-debuginfod-malformed.sh index 3bc9e799..83e6a3a9 100755 --- a/tests/run-debuginfod-malformed.sh +++ b/tests/run-debuginfod-malformed.sh @@ -45,9 +45,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/ # or without trailing / -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' | grep groom ps -q $PID1 -e -L -o '%p %c %a' | grep scan diff --git a/tests/run-debuginfod-tmp-home.sh b/tests/run-debuginfod-tmp-home.sh index dc9accb0..4256f6f2 100755 --- a/tests/run-debuginfod-tmp-home.sh +++ b/tests/run-debuginfod-tmp-home.sh @@ -45,9 +45,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/ # or without trailing / -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' | grep groom ps -q $PID1 -e -L -o '%p %c %a' | grep scan diff --git a/tests/run-debuginfod-writable.sh b/tests/run-debuginfod-writable.sh index 9cc4ea1d..c521a572 100755 --- a/tests/run-debuginfod-writable.sh +++ b/tests/run-debuginfod-writable.sh @@ -44,9 +44,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/ # or without trailing / -# Be patient when run on a busy machine things might take a bit. -export DEBUGINFOD_TIMEOUT=10 - # Check thread comm names ps -q $PID1 -e -L -o '%p %c %a' | grep groom ps -q $PID1 -e -L -o '%p %c %a' | grep scan