diff options
| author | Mark Wielaard <mark@klomp.org> | 2021-09-07 00:31:00 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2021-09-07 00:31:05 +0200 |
| commit | f0c8a9a9e4b85dbe613a08768e0b82cc1381407e (patch) | |
| tree | 81bade7813c194c73ff0cf8de7883f5b0d799645 | |
| parent | 7880ccb6483e76847cdf1c6c4e45a2180bee820a (diff) | |
| download | elfutils-f0c8a9a9e4b85dbe613a08768e0b82cc1381407e.tar.gz | |
tests: Only export DEBUGINFOD_URLS when necessary
A couple of test set DEBUGINFOD_URLS before starting a debuginfd
server causing the server to query itself or a nonexisting debuginfod
server as delegate. In most cases it should be set after, except for
the testcase that explicitly checks for errors when using an invalid
URL.
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | tests/ChangeLog | 10 | ||||
| -rwxr-xr-x | tests/run-debuginfod-archive-groom.sh | 3 | ||||
| -rwxr-xr-x | tests/run-debuginfod-archive-rename.sh | 3 | ||||
| -rwxr-xr-x | tests/run-debuginfod-federation-link.sh | 1 | ||||
| -rwxr-xr-x | tests/run-debuginfod-federation-metrics.sh | 2 | ||||
| -rwxr-xr-x | tests/run-debuginfod-federation-sqlite.sh | 1 |
6 files changed, 15 insertions, 5 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 14eb4d98..436a1c45 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,15 @@ 2021-09-06 Mark Wielaard <mark@klomp.org> + * run-debuginfod-archive-groom.sh: Set DEBUGINFOD_URLS after starting + debuginfod server. + * run-debuginfod-archive-rename.sh: Likewise. + * run-debuginfod-federation-link.sh: Don't set DEBUGINFOD_URLS. + * run-debuginfod-federation-sqlite.sh: Likewise. + * run-debuginfod-federation-metrics.sh: Add comment why invalid + DEBUGINFOD_URLS is set. + +2021-09-06 Mark Wielaard <mark@klomp.org> + * debuginfod-subr.sh (err): Change ports to port in for loop so both PORT1 and PORT2 are used. (get_ports): Simplify port selection by using for 50 for PORT1 and diff --git a/tests/run-debuginfod-archive-groom.sh b/tests/run-debuginfod-archive-groom.sh index 4b991f53..1e616448 100755 --- a/tests/run-debuginfod-archive-groom.sh +++ b/tests/run-debuginfod-archive-groom.sh @@ -29,7 +29,6 @@ DB=${PWD}/.debuginfod_tmp.sqlite tempfiles $DB export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache export DEBUGINFOD_TIMEOUT=10 -export DEBUGINFOD_URLS='http://127.0.0.1:'$PORT1 # Clean old dirictories mkdir R ${PWD}/F @@ -112,6 +111,8 @@ rm -rf extracted wait_ready $PORT1 'found_sourcerefs_total{source=".rpm archive"}' $sourcefiles +export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1 + # common source file sha1 SHA=f4a1a8062be998ae93b8f1cd744a398c6de6dbb1 # fedora31 diff --git a/tests/run-debuginfod-archive-rename.sh b/tests/run-debuginfod-archive-rename.sh index 38697eee..7ad4786e 100755 --- a/tests/run-debuginfod-archive-rename.sh +++ b/tests/run-debuginfod-archive-rename.sh @@ -28,7 +28,6 @@ get_ports DB=${PWD}/.debuginfod_tmp.sqlite export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache export DEBUGINFOD_TIMEOUT=10 -export DEBUGINFOD_URLS='http://127.0.0.1:'$PORT1 tempfiles $DEBUGINFOD_CACHE_PATH $DB # Clean old dirictories mkdir R ${PWD}/F @@ -84,6 +83,8 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 4 wait_ready $PORT1 'thread_work_pending{role="scan"}' 0 wait_ready $PORT1 'thread_busy{role="scan"}' 0 +export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1 + # retest rhel7 archive_test bc1febfd03ca05e030f0d205f7659db29f8a4b30 /usr/src/debug/hello-1.0/hello.c $SHA archive_test f0aa15b8aba4f3c28cac3c2a73801fefa644a9f2 /usr/src/debug/hello-1.0/hello.c $SHA diff --git a/tests/run-debuginfod-federation-link.sh b/tests/run-debuginfod-federation-link.sh index ae5d4381..42b8f101 100755 --- a/tests/run-debuginfod-federation-link.sh +++ b/tests/run-debuginfod-federation-link.sh @@ -25,7 +25,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:'$PORT1 tempfiles $DB # Clean old dirictories diff --git a/tests/run-debuginfod-federation-metrics.sh b/tests/run-debuginfod-federation-metrics.sh index 9998a04a..2e7550a6 100755 --- a/tests/run-debuginfod-federation-metrics.sh +++ b/tests/run-debuginfod-federation-metrics.sh @@ -25,7 +25,7 @@ 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 +export DEBUGINFOD_URLS='http://127.0.0.1:0' # Note invalid, will trigger error_count metric tempfiles $DB # Clean old dirictories mkdir D L F diff --git a/tests/run-debuginfod-federation-sqlite.sh b/tests/run-debuginfod-federation-sqlite.sh index d10a3385..a323b98e 100755 --- a/tests/run-debuginfod-federation-sqlite.sh +++ b/tests/run-debuginfod-federation-sqlite.sh @@ -25,7 +25,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 tempfiles $DB # Clean old dirictories |