tests: work around make check warning
authorDieter Verfaillie <dieterv@optionexplicit.be>
Wed, 31 Oct 2012 15:01:16 +0000 (16:01 +0100)
committerDieter Verfaillie <dieterv@optionexplicit.be>
Wed, 31 Oct 2012 16:04:04 +0000 (17:04 +0100)
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

tests/repository/Makefile.am

index ca2efe368bde9ec99910d37d8360422549dbf315..96afb891cc77bc9f9e356ba98b5623d27d23b9c1 100644 (file)
@@ -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)