diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/offsets/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/repository/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/warn/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/warn/warningtester.py | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 5426137a..60d37b39 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -36,7 +36,7 @@ check_PROGRAMS += gitestoffsets nodist_gitestoffsets_SOURCES = gitestoffsets.c gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -gitestoffsets_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS) +gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) gitestoffsets.c: gen-gitestoffsets offsets.h $(AM_V_GEN) $(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false ) diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am index 36f738d7..b7ed21c0 100644 --- a/tests/repository/Makefile.am +++ b/tests/repository/Makefile.am @@ -6,12 +6,12 @@ noinst_PROGRAMS = gitestrepo gitestthrows gitestrepo_SOURCES = $(srcdir)/gitestrepo.c gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS) +gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) gitestthrows_SOURCES = $(srcdir)/gitestthrows.c gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS) +gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) TESTS = gitestrepo gitestthrows TESTS_ENVIRONMENT=env top_builddir="$(top_builddir)" \ - XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" $(DEBUG)
\ No newline at end of file + XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" $(DEBUG) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 1801c451..a7dbc0a7 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -26,7 +26,7 @@ LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS) libannotation_la_SOURCES = $(srcdir)/annotation.c $(srcdir)/annotation.h libtestinherit_la_SOURCES = $(srcdir)/drawable.c $(srcdir)/drawable.h libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo.h -libfoo_la_LIBADD = $(top_builddir)/girepository/libgirepository-1.0.la +libfoo_la_LIBADD = $(top_builddir)/libgirepository-1.0.la libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h @@ -52,7 +52,7 @@ CLEANFILES = $(TYPELIBS) $(GIRS) BUILT_SOURCES = $(TYPELIBS) $(GIRS) EXTRA_DIST = $(EXPECTEDGIRS) -Regress-1.0.gir: $(top_builddir)/gir/Gio-2.0.gir libregress.la +Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir libregress.la Regress_1_0_gir_LIBS = libregress.la Regress_1_0_gir_INCLUDES = cairo-1.0 Gio-2.0 Regress_1_0_gir_FILES = $(libregress_la_SOURCES) @@ -101,7 +101,7 @@ GIRS += GtkFrob-1.0.gir noinst_PROGRAMS = barapp barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h -barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la +barapp_LDADD = $(top_builddir)/libgirepository-1.0.la barapp_LDFLAGS = -export-dynamic Bar-1.0.gir: barapp diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 3cd44b00..8b44cfcb 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -15,5 +15,5 @@ TESTS = \ EXTRA_DIST = warningtester.py common.h $(TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) $(PYTHON) $(srcdir)/warningtester.py +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index d43b6d5e..f8f55655 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -4,6 +4,10 @@ import os.path import sys from StringIO import StringIO +path=os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) +assert path is not None +sys.path.insert(0, path) + from giscanner.annotationparser import AnnotationParser from giscanner.ast import Include, Namespace from giscanner.introspectablepass import IntrospectablePass |