From 2d403709d97cca381873a9d56cd37f51c0f3eade Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 22 Dec 2018 22:24:41 -0800 Subject: allow tests for disabled features to be skipped Previously, pacman's test suite would fail when compiled without signature support. Adds a require_capability method to pmtest objects. Currently recognized values are 'gpg', 'curl', and 'nls'; although only gpg is used presently. Missing features are indicated by running pactest with one of the --without- options. This modifies pmenv to run each case as independent tests. Previously, a single pmenv could run multiple tests, combining there output into a single TAP stream but making it impossible to properly skip an entire test case. This change does not affect running pactest.py with a single test (as both autotools and meson do), but will affect anybody manually running pactest.py with multiple tests at once. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1e9ee152..98ad8b62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,12 @@ AM_PY_LOG_FLAGS = \ --ldconfig $(LDCONFIG) \ --bindir $(top_builddir)/src/pacman \ --bindir $(top_builddir)/scripts +if !HAVE_LIBGPGME +AM_PY_LOG_FLAGS += --without-gpg +endif +if !HAVE_LIBCURL +AM_PY_LOG_FLAGS += --without-curl +endif # create the pacman DB, cache, makepkg-template and system hook directories upon install install-data-local: -- cgit v1.2.3-54-g00ecf