diff options
| author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2012-10-31 16:01:16 +0100 |
|---|---|---|
| committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2012-10-31 17:04:04 +0100 |
| commit | 046fbbac8730fe7ca578596fb71eb96fc77cfb93 (patch) | |
| tree | c0af24366e6f07c3e6c95bfd58a02d518d224340 /tests | |
| parent | 9d465d2bdcdb04a4b0873d7628f4a3a6becd8216 (diff) | |
| download | gobject-introspection-046fbbac8730fe7ca578596fb71eb96fc77cfb93.tar.gz | |
tests: work around make check warning
The tests in tests/repository/ depend on libregress.so
from tests/scanner which cannot be loaded during make check.
Fixing this properly would require migrating to non-recursive
automake for the tests, but for now we can just work around
and set LD_LIBRARY_PATH (for linux) and PATH (for win32).
http://bugzilla.gnome.org/show_bug.cgi?id=675049
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/repository/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am index ca2efe36..96afb891 100644 --- a/tests/repository/Makefile.am +++ b/tests/repository/Makefile.am @@ -17,5 +17,8 @@ gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) TESTS = gitestrepo gitestthrows gitypelibtest -TESTS_ENVIRONMENT=env GI_TYPELIB_PATH=$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner: \ - XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" $(DEBUG) +TESTS_ENVIRONMENT=env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \ + XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \ + PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \ + LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \ + $(DEBUG) |