diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-07 20:16:18 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-07 20:16:18 +0000 |
| commit | b5d95a4912c3df5d56fd46eca4f3bd1681f927cd (patch) | |
| tree | 0514fa3ec5a040b41e979032406828e6d1842649 | |
| parent | 20d4c10c34a8003d42656926a386cf2cc66f4389 (diff) | |
Cleaned up a little bit ut environment ; fixes FTBFS when using --disable-shared --enable-static
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 87a62d2..3a8b0f4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,9 @@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh check-network.sh TESTS_ENVIRONMENT = -TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" -TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH +TESTS_ENVIRONMENT += PATH=$(top_builddir)/src:$$PATH +# note: libtool should handle that +### TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" TESTS_ENVIRONMENT += ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS) TESTS_ENVIRONMENT += HTTPS_SUPPORT=$(HTTPS_SUPPORT) diff --git a/tests/Makefile.in b/tests/Makefile.in index bb0a187..27a67ba 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -182,8 +182,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh check-network.sh -TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \ - PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH \ +# note: libtool should handle that +### TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" +TESTS_ENVIRONMENT = PATH=$(top_builddir)/src:$$PATH \ ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS) \ HTTPS_SUPPORT=$(HTTPS_SUPPORT) TEST_EXTENSIONS = .test |