r15233 - gnucash/branches/reshuffle-modules - Fix tests and trim TESTS_ENVIRONMENT's to minimum versions.
Andreas Köhler
andi5 at cvs.gnucash.org
Tue Dec 19 04:07:06 EST 2006
Author: andi5
Date: 2006-12-19 04:07:04 -0500 (Tue, 19 Dec 2006)
New Revision: 15233
Trac: http://svn.gnucash.org/trac/changeset/15233
Modified:
gnucash/branches/reshuffle-modules/
gnucash/branches/reshuffle-modules/configure.in
gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am
gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-build-env.in
gnucash/branches/reshuffle-modules/src/bin/test/Makefile.am
gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am
gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/import-export/test/Makefile.am
gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am
gnucash/branches/reshuffle-modules/src/register/register-core/test/Makefile.am
gnucash/branches/reshuffle-modules/src/register/register-gnome/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/report-gnome/Makefile.am
gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am
gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am
gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am
Log:
Fix tests and trim TESTS_ENVIRONMENT's to minimum versions.
Update gnc-build-env.in.
Readd report-gnome/test directory.
Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1005
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1006
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
Modified: gnucash/branches/reshuffle-modules/configure.in
===================================================================
--- gnucash/branches/reshuffle-modules/configure.in 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/configure.in 2006-12-19 09:07:04 UTC (rev 15233)
@@ -2216,7 +2216,7 @@
src/register/register-gnome/test/Makefile
src/report/Makefile
src/report/report-gnome/Makefile
- dnl # src/report/report-gnome/test/Makefile
+ src/report/report-gnome/test/Makefile
src/report/report-system/Makefile
src/report/report-system/test/Makefile
src/report/standard-reports/Makefile
Modified: gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/app-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -14,21 +14,15 @@
test-print-parse-amount.c
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/core-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/backend/file/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -177,13 +177,8 @@
test-xml2-is-file
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --library-dir ${top_builddir}/src/backend/file \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --gnc-module-dir ${top_srcdir}/src/engine
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
Modified: gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-build-env.in
===================================================================
--- gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-build-env.in 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-build-env.in 2006-12-19 09:07:04 UTC (rev 15233)
@@ -30,45 +30,52 @@
fi
eval `@-GNC_SRCDIR-@/src/gnc-test-env @-GNC_TEST_SRFI_LOAD_CMD-@ \
- --library-dir ${top_builddir}/src/gnome \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/lib/guile-www \
- --guile-load-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/backend/file \
+ --gnc-module-dir ${top_builddir}/src/network-utils \
+ --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/tax/us \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/gnome-search \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_builddir}/src/app-file \
- --gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/report/report-gnome \
--gnc-module-dir ${top_builddir}/src/report/report-system \
+ --gnc-module-dir ${top_builddir}/src/report/standard-reports \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/report/standard-reports \
--gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
- --gnc-module-dir ${top_builddir}/src/backend/rpc \
- --gnc-module-dir ${top_builddir}/src/backend/file \
- --gnc-module-dir ${top_builddir}/src/backend/postgres \
+ --gnc-module-dir ${top_builddir}/src/report/stylesheets \
+ --gnc-module-dir ${top_builddir}/src/register/register-core \
+ --gnc-module-dir ${top_builddir}/src/register/register-gnome \
+ --gnc-module-dir ${top_builddir}/src/register/ledger-core \
+ --gnc-module-dir ${top_builddir}/src/import-export \
+ --gnc-module-dir ${top_builddir}/src/import-export/qif-import \
+ --gnc-module-dir ${top_builddir}/src/import-export/ofx \
+ --gnc-module-dir ${top_builddir}/src/import-export/hbci \
+ --gnc-module-dir ${top_builddir}/src/import-export/log-replay \
--gnc-module-dir ${top_builddir}/src/business/business-core \
--gnc-module-dir ${top_builddir}/src/business/business-core/file \
+ --gnc-module-dir ${top_builddir}/src/business/business-utils \
--gnc-module-dir ${top_builddir}/src/business/dialog-tax-table \
- --gnc-module-dir ${top_builddir}/src/business/business-utils \
--gnc-module-dir ${top_builddir}/src/business/business-ledger \
--gnc-module-dir ${top_builddir}/src/business/business-gnome \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/report/standard-reports \
+ --guile-load-dir ${top_builddir}/src/report/utility-reports \
+ --guile-load-dir ${top_builddir}/src/report/locale-specific/us \
+ --guile-load-dir ${top_builddir}/src/report/report-gnome \
+ --guile-load-dir ${top_builddir}/src/report/stylesheets \
+ --guile-load-dir ${top_builddir}/src/import-export/qif-import \
+ --guile-load-dir ${top_builddir}/src/business/business-core \
+ --guile-load-dir ${top_builddir}/src/business/business-utils \
+ --guile-load-dir ${top_builddir}/src/business/dialog-tax-table \
+ --guile-load-dir ${top_builddir}/src/business/business-gnome \
--guile-load-dir ${top_builddir}/src/business/business-reports \
- --gnc-module-dir ${top_builddir}/src/import-export \
- --gnc-module-dir ${top_builddir}/src/import-export/qif-io-core \
- --gnc-module-dir ${top_builddir}/src/import-export/qif-import \
- --gnc-module-dir ${top_builddir}/src/import-export/binary-import \
- --gnc-module-dir ${top_builddir}/src/import-export/ofx \
- --gnc-module-dir ${top_builddir}/src/import-export/hbci \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/register/ledger-core \
- --gnc-module-dir ${top_builddir}/src/register/register-gnome \
- --gnc-module-dir ${top_builddir}/src/register/register-core \
`
exec "$@"
Modified: gnucash/branches/reshuffle-modules/src/bin/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/bin/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/bin/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -2,6 +2,6 @@
TESTS = test-version
TESTS_ENVIRONMENT := \
- PATH="..:${PATH}" LD_LIBRARY_PATH="${top_builddir}/lib/libqof/qof/.libs:${LD_LIBRARY_PATH}"
+ PATH="..:${PATH}"
EXTRA_DIST = test-version
Modified: gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -28,13 +28,11 @@
test-vendor
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/business/business-core \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --gnc-module-dir ${top_srcdir}/src/engine
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/business/business-core
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -8,7 +8,7 @@
-I${top_srcdir}/src/engine/test-core \
${GUILE_INCS} \
${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -22,7 +22,7 @@
# these tests are ordered kind more or less in the order
# that they should be executed, with more basic tests coming first.
-#
+#
TESTS = \
test-link \
test-load-engine \
@@ -45,17 +45,13 @@
test-freq-spec \
test-recurrence \
test-scm-query \
- test-book-merge
+ test-book-merge
GNC_TEST_DEPS := \
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --library-dir ${top_builddir}/src/core-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/backend/file \
- --guile-load-dir ${top_srcdir}/src/engine/test
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
SRCDIR=${srcdir} \
Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -28,11 +28,10 @@
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-bar \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-baz \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/misc-mods \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/misc-mods
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/gnome-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -9,21 +9,10 @@
##lib_LTLIBRARIES = libgncgnome.la
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
@@ -53,12 +42,10 @@
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD= \
${GUILE_LIBS} \
- ${top_builddir}/src/gnc-module/libgncmodule.la
+ ${top_builddir}/src/gnc-module/libgncmodule.la
EXTRA_DIST = \
test-load-module
testit:
libtool --mode execute gdb test-link-module
-
-
Modified: gnucash/branches/reshuffle-modules/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/import-export/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -7,7 +7,7 @@
-I${top_srcdir}/src/import-export \
${GUILE_INCS} \
${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -22,24 +22,9 @@
test-import-parse
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/import-export \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/app-utils \
- --gnc-module-dir ${top_srcdir}/src/gnome-utils \
- --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 \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/import-export
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/network-utils/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -7,8 +7,7 @@
test-load-module
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --library-dir ${top_builddir}/lib/libqof/qof \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/network-utils
TESTS_ENVIRONMENT := \
Modified: gnucash/branches/reshuffle-modules/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/register/register-core/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/register/register-core/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -2,12 +2,12 @@
test-link-module
# test-load-module
-TESTS_ENVIRONMENT= \
- GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
- LTDL_LIBRARY_PATH=.. \
- LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
+#GNC_TEST_DEPS := \
+#
+#TESTS_ENVIRONMENT := \
+# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
noinst_PROGRAMS = \
test-link-module
Modified: gnucash/branches/reshuffle-modules/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/register/register-gnome/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/register/register-gnome/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -2,12 +2,12 @@
test-link-module
# test-load-module
-TESTS_ENVIRONMENT= \
- GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
- LTDL_LIBRARY_PATH=.. \
- LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
+#GNC_TEST_DEPS := \
+#
+#TESTS_ENVIRONMENT := \
+# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
noinst_PROGRAMS = \
test-link-module
@@ -15,9 +15,8 @@
test_link_module_LDADD = \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ../libgncmod-register-gnome.la
+ ../libgncmod-register-gnome.la
#EXTRA_DIST = test-load-module
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
-
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
Modified: gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/locale-specific/us/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,29 +1,13 @@
-TESTS = test-load-module test-link-module
+TESTS = test-load-module test-link-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/tax/us \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/tax/us \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/tax/us
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-gnome/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/report-gnome/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,7 +1,4 @@
-SUBDIRS = .
-# test -- removed 'test' from SUBDIRS by jsled 2004.05.02 .. I don't know how
-# to get the test-link-mumble to link correctly; plz assist.
-PWD := $(shell pwd)
+SUBDIRS = . test
pkglib_LTLIBRARIES = libgncmod-report-gnome.la
Modified: gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/report-gnome/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,33 +1,19 @@
TESTS = \
test-link-module \
- test-load-module
+ test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_builddir}/src/scm \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-LDADD = ../libgncmod-report-gnome.la
+LDADD = ../libgncmod-report-gnome.la
-noinst_PROGRAMS = test-link-module
+noinst_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module
Modified: gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/report-system/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,34 +1,17 @@
TESTS = \
test-link-module \
- test-load-module
+ test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-LDADD = ../libgncmod-report-system.la
-noinst_PROGRAMS = test-link-module
+noinst_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module
Modified: gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/standard-reports/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,28 +1,11 @@
-TESTS=test-load-module
+TESTS=test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/stylesheets/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,29 +1,11 @@
-TESTS=test-load-module
+TESTS=test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/scm \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/report/utility-reports \
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnome-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/report/stylesheets \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/report/utility-reports/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,28 +1,11 @@
-TESTS = test-load-module
+TESTS = test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --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
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am 2006-12-19 09:06:46 UTC (rev 15232)
+++ gnucash/branches/reshuffle-modules/src/tax/us/test/Makefile.am 2006-12-19 09:07:04 UTC (rev 15233)
@@ -1,28 +1,16 @@
-TESTS = test-link-module test-load-module
+TESTS = test-link-module test-load-module
# Some of these dirs may not be needed anymore.
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/tax/us \
- --gnc-module-dir ${top_srcdir}/src/tax/us \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/lib \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/tax/us
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
-noinst_PROGRAMS=test-link-module
+noinst_PROGRAMS=test-link-module
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS}
More information about the gnucash-changes
mailing list