r14922 - gnucash/branches/2.0/src - Add library dir for test runtime where necessary, as discussed on gnucash-devel. Merges from trunk: 11831, 14770, 14771, 14921.
Christian Stimming
cstim at cvs.gnucash.org
Mon Oct 2 10:58:59 EDT 2006
Author: cstim
Date: 2006-10-02 10:58:57 -0400 (Mon, 02 Oct 2006)
New Revision: 14922
Trac: http://svn.gnucash.org/trac/changeset/14922
Modified:
gnucash/branches/2.0/src/app-utils/test/Makefile.am
gnucash/branches/2.0/src/backend/file/test/Makefile.am
gnucash/branches/2.0/src/bin/test/Makefile.am
gnucash/branches/2.0/src/business/business-core/test/Makefile.am
gnucash/branches/2.0/src/engine/test/Makefile.am
gnucash/branches/2.0/src/import-export/test/Makefile.am
gnucash/branches/2.0/src/network-utils/test/Makefile.am
gnucash/branches/2.0/src/report/locale-specific/us/test/Makefile.am
gnucash/branches/2.0/src/report/report-system/test/Makefile.am
gnucash/branches/2.0/src/report/standard-reports/test/Makefile.am
gnucash/branches/2.0/src/report/stylesheets/test/Makefile.am
gnucash/branches/2.0/src/report/utility-reports/test/Makefile.am
Log:
Add library dir for test runtime where necessary, as discussed on gnucash-devel. Merges from trunk: 11831, 14770, 14771, 14921.
Modified: gnucash/branches/2.0/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/app-utils/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/app-utils/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -29,6 +29,7 @@
--guile-load-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/backend/file/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/backend/file/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -183,6 +183,8 @@
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
--guile-load-dir ${G_WRAP_MODULE_DIR} \
+ --library-dir ${top_builddir}/src/backend/file \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/bin/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/bin/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/bin/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -2,6 +2,6 @@
TESTS = test-version
TESTS_ENVIRONMENT := \
- PATH="..:${PATH}"
+ PATH="..:${PATH}" LD_LIBRARY_PATH="${top_builddir}/lib/libqof/qof/.libs:${LD_LIBRARY_PATH}"
EXTRA_DIST = test-version
Modified: gnucash/branches/2.0/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/business/business-core/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/business/business-core/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -36,6 +36,7 @@
--gnc-module-dir ${top_builddir}/src/business/business-core \
--gnc-module-dir ${top_srcdir}/src/gnc-module \
--gnc-module-dir ${top_srcdir}/src/engine \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR} \
--guile-load-dir ${G_WRAP_MODULE_DIR}
Modified: gnucash/branches/2.0/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/engine/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/engine/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -56,6 +56,9 @@
--gnc-module-dir ${top_srcdir}/src/engine \
--guile-load-dir ${top_srcdir}/src/engine/test \
--guile-load-dir ${G_WRAP_MODULE_DIR} \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/backend/file \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/import-export/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/import-export/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -35,6 +35,7 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR} \
--guile-load-dir ${G_WRAP_MODULE_DIR} \
--guile-load-dir ${top_builddir}/src/scm \
Modified: gnucash/branches/2.0/src/network-utils/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/network-utils/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/network-utils/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -10,6 +10,7 @@
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/network-utils \
--guile-load-dir ${G_WRAP_MODULE_DIR} \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/report/locale-specific/us/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/report/locale-specific/us/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -24,6 +24,7 @@
--guile-load-dir ${top_srcdir}/src/gnome \
--library-dir ${top_srcdir}/src/gnome-utils \
--library-dir ${top_srcdir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/report/report-system/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/report/report-system/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -23,6 +23,7 @@
--guile-load-dir ${top_srcdir}/src/report/report-system \
--library-dir ${top_srcdir}/src/gnome-utils \
--library-dir ${top_srcdir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/report/standard-reports/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/report/standard-reports/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -23,6 +23,7 @@
--guile-load-dir ${top_srcdir}/src/report/report-system \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/report/stylesheets/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/report/stylesheets/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -24,6 +24,7 @@
--guile-load-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/2.0/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/report/utility-reports/test/Makefile.am 2006-10-02 14:02:04 UTC (rev 14921)
+++ gnucash/branches/2.0/src/report/utility-reports/test/Makefile.am 2006-10-02 14:58:57 UTC (rev 14922)
@@ -23,6 +23,7 @@
--guile-load-dir ${top_srcdir}/src/report/utility-reports \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/lib/libqof/qof \
--library-dir ${G_WRAP_LIB_DIR}
TESTS_ENVIRONMENT := \
More information about the gnucash-changes
mailing list