[librsvg: 1/3] tests: use EXTRA_DIST for test resources
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/3] tests: use EXTRA_DIST for test resources
- Date: Tue, 3 Nov 2020 14:57:13 +0000 (UTC)
commit 5932bd768a60f83d32f6008ff974c29b07b492e7
Author: Sven Neumann <sven svenfoo org>
Date: Tue Nov 3 09:00:54 2020 +0100
tests: use EXTRA_DIST for test resources
Use EXTRA_DIST instead of "dist_installed_test_data" as provided by
glib-tap.mk. The test files are mostly used by "cargo test" now and
having them listed as "dist_installed_test_data" adds hundreds of
dependencies to 'make check' causing lots of noise in the output.
Also do not redefine NULL, it's already defined in glib-tap.mk.
tests/Makefile.am | 60 ++++++++++++++++++++++++++++---------------------------
1 file changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dea73eec..a73173c8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,30 +1,23 @@
include $(top_srcdir)/glib-tap.mk
-NULL =
-
-test_sources = \
- build.rs \
- src/api.rs \
- src/bugs.rs \
- src/cmdline/mod.rs \
- src/cmdline/rsvg_convert.rs \
- src/errors.rs \
- src/intrinsic_dimensions.rs \
- src/loading_crash.rs \
- src/main.rs \
- src/predicates/file.rs \
- src/predicates/mod.rs \
- src/predicates/pdf.rs \
- src/predicates/png.rs \
- src/primitives.rs \
- src/reference.rs \
- src/render_crash.rs \
- src/utils.rs \
- $(NULL)
-
-EXTRA_DIST += \
- $(test_sources) \
- README.md \
+test_sources = \
+ build.rs \
+ src/api.rs \
+ src/bugs.rs \
+ src/cmdline/mod.rs \
+ src/cmdline/rsvg_convert.rs \
+ src/errors.rs \
+ src/intrinsic_dimensions.rs \
+ src/loading_crash.rs \
+ src/main.rs \
+ src/predicates/file.rs \
+ src/predicates/mod.rs \
+ src/predicates/pdf.rs \
+ src/predicates/png.rs \
+ src/primitives.rs \
+ src/reference.rs \
+ src/render_crash.rs \
+ src/utils.rs \
$(NULL)
test_programs = api
@@ -35,8 +28,8 @@ api_SOURCES = \
test-utils.h \
$(NULL)
-LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
- $(LIBRSVG_LIBS) \
+LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
+ $(LIBRSVG_LIBS) \
$(LIBM)
AM_CPPFLAGS = \
@@ -48,8 +41,10 @@ AM_CPPFLAGS = \
-DTOP_SRC_DIR="\"$(top_srcdir)\"" \
$(LIBRSVG_CFLAGS)
-dist_installed_test_data = \
- $(wildcard $(srcdir)/resources/*) \
+test_resources = \
+ $(wildcard $(srcdir)/resources/*.ttf)
+
+test_fixtures = \
$(wildcard $(srcdir)/fixtures/api/*.svg) \
$(wildcard $(srcdir)/fixtures/crash/*.svg) \
$(wildcard $(srcdir)/fixtures/crash/*.png) \
@@ -72,5 +67,12 @@ dist_installed_test_data = \
$(wildcard $(srcdir)/fixtures/render-crash/*.svg) \
$(wildcard $(srcdir)/fixtures/dimensions/*.svg)
+EXTRA_DIST += \
+ $(test_sources) \
+ $(test_resources) \
+ $(test_fixtures) \
+ README.md \
+ $(NULL)
+
clean-local:
rm -rf output
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]