From 479d60d5a061b1b052d653c898b7b99f26cab3b8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 11 Nov 2021 15:46:26 +0100 Subject: [PATCH] tests: Don't set DEBUGINFOD_TIMEOUT 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 a59cdd5..26a4d67 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 c1b2cf8..1f46c34 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 030e0aa..e2c394e 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 5369949..a1a6cc1 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 9f7454b..5f24ea7 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 b944442..8b9aed3 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 39ee519..7279b02 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 06f60e7..a3722c9 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 1347e7b..4f04374 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 2d0fd6d..3da457e 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 45761ed..449df5d 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 3bc9e79..83e6a3a 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 dc9accb..4256f6f 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 9cc4ea1..c521a57 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 -- 2.7.4