diff options
author | Mark Wielaard <mark@klomp.org> | 2021-08-28 15:54:18 +0200 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2021-08-28 15:54:18 +0200 |
commit | 17a9b1303e533c13aac6550844bdd68c669091bf (patch) | |
tree | e227de03f6dcef9a9305a56232d90a86fac379eb | |
parent | d3f914023abcd6ae76b168da97518e5e7dbd761a (diff) | |
download | elfutils-17a9b1303e533c13aac6550844bdd68c669091bf.tar.gz |
tests: Use fresh separate databases for debuginfd forwarded-ttl-limit
Sharing the database between the two debuginfod instances that forward
queries to each other causes issues. Make both debuginfod instances
use a new fresh database.
Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r-- | tests/ChangeLog | 5 | ||||
-rwxr-xr-x | tests/run-debuginfod-find.sh | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 29c48b97..cbd1c227 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2021-08-28 Mark Wielaard <mark@klomp.org> + + * run-debuginfod-find.sh: Use clean, separate databases for + forwarded-ttl-limit tests. + 2021-08-20 Di Chen <dichen@redhat.com> * run-debuginfod-find.sh: Add test for X-Forwarded-For hops limit. diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh index 7e12dd7f..5d38d625 100755 --- a/tests/run-debuginfod-find.sh +++ b/tests/run-debuginfod-find.sh @@ -824,10 +824,13 @@ done tempfiles vlog$PORT4 vlog$PORT5 errfiles vlog$PORT4 vlog$PORT5 -env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS=http://127.0.0.1:$PORT5 ${abs_builddir}/../debuginfod/debuginfod $VERBOSE --forwarded-ttl-limit 0 -p $PORT4 > vlog$PORT4 2>&1 & +# Give each debuginfd its own clean database. +tempfiles db.$PORT4.sql db.$PORT5.sql + +env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS=http://127.0.0.1:$PORT5 ${abs_builddir}/../debuginfod/debuginfod $VERBOSE -d db.$PORT4.sql --forwarded-ttl-limit 0 -p $PORT4 > vlog$PORT4 2>&1 & PID5=$! -env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS=http://127.0.0.1:$PORT4 ${abs_builddir}/../debuginfod/debuginfod $VERBOSE --forwarded-ttl-limit 1 -p $PORT5 > vlog$PORT5 2>&1 & +env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS=http://127.0.0.1:$PORT4 ${abs_builddir}/../debuginfod/debuginfod $VERBOSE -d db.$PORT5.sql --forwarded-ttl-limit 1 -p $PORT5 > vlog$PORT5 2>&1 & PID6=$! wait_ready $PORT4 'ready' 1 |