summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2020-02-21 13:34:09 +0100
committerMark Wielaard <mark@klomp.org>2020-02-21 13:36:43 +0100
commit8f430df5eee70da920ca1e0b00aae73eb2a38b18 (patch)
treec2efc4a0a2d7c618849e0a27c3cd56e871c70290
parent889edd912ccbe4f0725319acec52edda29ec1584 (diff)
downloadelfutils-8f430df5eee70da920ca1e0b00aae73eb2a38b18.tar.gz
tests: Explicitly unset DEBUGINFOD_URLS.
If DEBUGINFOD_URLS is set various tests will try to query the debuginfod server which can stall the tests a bit. If other evironment variables like DEBUGINFOD_PROGRESS are set it will make various tests fail because the expected output doesn't match. Tests should PASS without needing a debuginfod server, unless they test (and set) one themselves. Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/Makefile.am2
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 01e4a083..32ca1ce0 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-21 Mark Wielaard <mark@klomp.org>
+
+ * Makefile.am (TESTS_ENVIRONMENT): Explicitly unset DEBUGINFOD_URLS.
+ (installed_TESTS_ENVIRONMENT): Likewise.
+
2020-02-19 Aaron Merey <amerey@redhat.com>
* run-debuginfod-find.sh: Test that files unrelated to debuginfod
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1db1150d..a83c3d67 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -495,6 +495,7 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
export abs_top_builddir; \
export libdir; export bindir; \
export LC_ALL; export LANG; export VALGRIND_CMD; \
+ unset DEBUGINFOD_URLS; \
NM=$(NM); export NM;
installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
installed $(tests_rpath) \
@@ -509,6 +510,7 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
export abs_srcdir; export abs_builddir; \
export abs_top_builddir; \
export LC_ALL; export LANG; export VALGRIND_CMD; \
+ unset DEBUGINFOD_URLS; \
NM=$(NM); export NM;
LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
$(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod