From: Mark Wielaard <mark@klomp.org>
To: elfutils-devel@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [COMMITTED] tests: Only export DEBUGINFOD_URLS when necessary
Date: Tue, 7 Sep 2021 01:03:36 +0200 [thread overview]
Message-ID: <20210906230336.187824-1-mark@klomp.org> (raw)
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>
---
tests/ChangeLog | 10 ++++++++++
tests/run-debuginfod-archive-groom.sh | 3 ++-
tests/run-debuginfod-archive-rename.sh | 3 ++-
tests/run-debuginfod-federation-link.sh | 1 -
tests/run-debuginfod-federation-metrics.sh | 2 +-
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,3 +1,13 @@
+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
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
--
2.32.0
reply other threads:[~2021-09-06 23:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210906230336.187824-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).