summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMark Wielaard <[email protected]>2016-01-08 13:35:33 +0100
committerMark Wielaard <[email protected]>2016-01-08 13:35:48 +0100
commitdd131168e2abf2f0fc872829e1101366395cc390 (patch)
treefad165581e3df1f869cce5e8a5535d55ff5f7afa /tests
parentcc888f73c3a1370d5cc91c5357ae400f3870f285 (diff)
Simplify code and build now that zlib support is no longer optional.
Now that we always require zlib support we don't need to conditionally build or compile code that depends on it. Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/Makefile.am7
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3d912600..453c4186 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-08 Mark Wielaard <[email protected]>
+
+ * Makefile.am (TESTS): Always unconditionally add
+ run-readelf-zdebug.sh and run-readelf-zdebug-rel.sh.
+
2015-12-16 Mark Wielaard <[email protected]>
* run-compress-test.sh: New test.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 819f2d1e..d09a6d7b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -124,7 +124,8 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
elfshphehdr run-lfs-symbols.sh run-dwelfgnucompressed.sh \
run-elfgetchdr.sh \
run-elfgetzdata.sh run-elfputzdata.sh run-zstrptr.sh \
- run-compress-test.sh
+ run-compress-test.sh \
+ run-readelf-zdebug.sh run-readelf-zdebug-rel.sh
if !BIARCH
export ELFUTILS_DISABLE_BIARCH = 1
@@ -143,10 +144,6 @@ if LZMA
TESTS += run-readelf-s.sh run-dwflsyms.sh
endif
-if ZLIB
-TESTS += run-readelf-zdebug.sh run-readelf-zdebug-rel.sh
-endif
-
if HAVE_LIBASM
check_PROGRAMS += $(asm_TESTS)
TESTS += $(asm_TESTS)