diff options
| author | Simon Feltman <sfeltman@src.gnome.org> | 2013-12-21 16:31:30 -0800 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-12-29 19:05:04 +0000 |
| commit | c981aa7c719ceff77835dde711b7dd99b2be53a3 (patch) | |
| tree | 73f9f8cde866fae3ad93c5a323a633d8fe592dec | |
| parent | 3160f642dbed35b4af8e4d9314c60e4a037884c8 (diff) | |
| download | gobject-introspection-c981aa7c719ceff77835dde711b7dd99b2be53a3.tar.gz | |
tests: Use EXTRA_LTLIBRARIES instead of check_LTLIBRARIES
Update tests/Makefile.am and tests/scanner/Makefile.am to use
EXTRA_LTLIBRARIES which minimizes the building of libraries to only
dependencies of specific tests when using: make check TESTS="..."
https://bugzilla.gnome.org/show_bug.cgi?id=720713
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/repository/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 26fe83bb..877c2fc5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,7 +16,7 @@ tests_DATA = \ gimarshallingtests.c \ gimarshallingtests.h -check_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la +EXTRA_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la libeverything_1_0_la_SOURCES = everything.c libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c @@ -29,6 +29,7 @@ BUILT_SOURCES += everything.c everything.h CLEANFILES += \ $(BUILT_SOURCES) \ + $(EXTRA_LTLIBRARIES) \ everything-stamp.h \ Everything-1.0.gir \ Everything-1.0.typelib \ @@ -65,5 +66,6 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile %.typelib: %.gir $(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@ -check: Everything-1.0.typelib GIMarshallingTests-1.0.typelib +TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib +TESTS_ENVIRONMENT=$(srcdir)/gi-tester diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am index 96afb891..882fa9ec 100644 --- a/tests/repository/Makefile.am +++ b/tests/repository/Makefile.am @@ -2,7 +2,8 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) AM_LDFLAGS = -module -avoid-version LIBS = $(GOBJECT_LIBS) -check_PROGRAMS = gitestrepo gitestthrows gitypelibtest +EXTRA_PROGRAMS = gitestrepo gitestthrows gitypelibtest +CLEANFILES = $(EXTRA_PROGRAMS) gitestrepo_SOURCES = $(srcdir)/gitestrepo.c gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index bf7afc92..2a9c51c1 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -5,7 +5,9 @@ include $(top_srcdir)/Makefile.introspection INTROSPECTION_SCANNER_ARGS += --warn-all -check_LTLIBRARIES = \ +CLEANFILES = + +EXTRA_LTLIBRARIES = \ libsletter.la \ libutility.la \ libgtkfrob.la \ @@ -13,6 +15,7 @@ check_LTLIBRARIES = \ libregress.la \ libwarnlib.la \ $(NULL) +CLEANFILES += $(EXTRA_LTLIBRARIES) AM_CPPFLAGS = -I$(top_srcdir)/girepository AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) @@ -70,7 +73,7 @@ TYPELIBS = $(GIRS:.gir=.typelib) CHECKGIRS = $(GIRS) EXPECTEDGIRS = $(GIRS:.gir=-expected.gir) INTROSPECTION_GIRS = $(GIRS) -CLEANFILES = $(TYPELIBS) $(GIRS) +CLEANFILES += $(TYPELIBS) $(GIRS) EXTRA_DIST = $(EXPECTEDGIRS) SLetter-1.0.gir: $(top_builddir)/Gio-2.0.gir libsletter.la @@ -126,7 +129,8 @@ GetType_1_0_gir_SCANNERFLAGS = --c-include="gettype.h" --identifier-prefix=GetTy GIRS += GetType-1.0.gir if !OS_WIN32 -check_PROGRAMS = barapp +EXTRA_PROGRAMS = barapp +CLEANFILES += $(EXTRA_PROGRAMS) barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h barapp_LDADD = $(top_builddir)/libgirepository-1.0.la |