r21698 - gnucash/branches/2.4/src - [r21657][Testing] Set GNC_BUILDDIR and GNC_UNINSTALLED where needed
John Ralls
jralls at code.gnucash.org
Fri Dec 9 18:11:26 EST 2011
Author: jralls
Date: 2011-12-09 18:11:26 -0500 (Fri, 09 Dec 2011)
New Revision: 21698
Trac: http://svn.gnucash.org/trac/changeset/21698
Modified:
gnucash/branches/2.4/src/app-utils/test/Makefile.am
gnucash/branches/2.4/src/app-utils/test/test-link-module.c
gnucash/branches/2.4/src/app-utils/test/test-load-module
gnucash/branches/2.4/src/app-utils/test/test-scm-query-string.c
gnucash/branches/2.4/src/app-utils/test/test-sx.c
gnucash/branches/2.4/src/backend/xml/test/Makefile.am
gnucash/branches/2.4/src/backend/xml/test/test-load-example-account.c
gnucash/branches/2.4/src/backend/xml/test/test-xml-commodity.c
gnucash/branches/2.4/src/business/business-core/test/test-business.c
gnucash/branches/2.4/src/engine/test/Makefile.am
gnucash/branches/2.4/src/engine/test/test-create-account.scm
gnucash/branches/2.4/src/engine/test/test-scm-query-import.scm
gnucash/branches/2.4/src/engine/test/test-scm-query.c
gnucash/branches/2.4/src/gnome-utils/test/Makefile.am
gnucash/branches/2.4/src/gnome-utils/test/test-link-module.c
gnucash/branches/2.4/src/gnome-utils/test/test-load-module
gnucash/branches/2.4/src/import-export/test/Makefile.am
gnucash/branches/2.4/src/import-export/test/test-import-parse.c
gnucash/branches/2.4/src/report/report-gnome/test/Makefile.am
gnucash/branches/2.4/src/report/report-gnome/test/test-link-module.c
gnucash/branches/2.4/src/report/report-gnome/test/test-load-module
gnucash/branches/2.4/src/report/report-system/gnc-report.c
gnucash/branches/2.4/src/report/report-system/test/Makefile.am
gnucash/branches/2.4/src/report/report-system/test/test-link-module.c
gnucash/branches/2.4/src/report/report-system/test/test-load-module
gnucash/branches/2.4/src/report/standard-reports/test/Makefile.am
gnucash/branches/2.4/src/report/standard-reports/test/test-load-module
gnucash/branches/2.4/src/report/stylesheets/test/Makefile.am
gnucash/branches/2.4/src/report/stylesheets/test/test-load-module
gnucash/branches/2.4/src/report/utility-reports/test/Makefile.am
gnucash/branches/2.4/src/report/utility-reports/test/test-load-module
Log:
[r21657][Testing] Set GNC_BUILDDIR and GNC_UNINSTALLED where needed
These are all of the locations where tests raised errors about not being
able to find backends or standard reports.
Note that in many cases the tests would pass. I fixed some of the bogus
tests, but there are still plenty more that either do nothing at all or
return success no matter what happens.
Modified: gnucash/branches/2.4/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/app-utils/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -26,10 +26,13 @@
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
--library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
Modified: gnucash/branches/2.4/src/app-utils/test/test-link-module.c
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/test-link-module.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/app-utils/test/test-link-module.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,7 +1,21 @@
#include <stdlib.h>
+#include <libguile.h>
+#include <gnc-module.h>
+static void
+guile_main(void *closure, int argc, char ** argv)
+{
+ GNCModule mod;
+ gnc_module_system_init();
+ mod = gnc_module_load("gnucash/app-utils", 0);
+
+ exit(mod == NULL);
+}
+
int
main(int argc, char ** argv)
{
- exit(0);
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
+ scm_boot_guile(argc, argv, guile_main, NULL);
+ return 0;
}
Modified: gnucash/branches/2.4/src/app-utils/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/app-utils/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -2,6 +2,7 @@
exec guile -s "$0"
!#
+(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
Modified: gnucash/branches/2.4/src/app-utils/test/test-scm-query-string.c
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/test-scm-query-string.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/app-utils/test/test-scm-query-string.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -119,6 +119,7 @@
int
main (int argc, char **argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile (argc, argv, main_helper, NULL);
return 0;
}
Modified: gnucash/branches/2.4/src/app-utils/test/test-sx.c
===================================================================
--- gnucash/branches/2.4/src/app-utils/test/test-sx.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/app-utils/test/test-sx.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -192,6 +192,7 @@
int
main(int argc, char **argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
g_type_init();
qof_init();
gnc_engine_init(0, NULL);
Modified: gnucash/branches/2.4/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/xml/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/backend/xml/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -189,12 +189,14 @@
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/sql \
--library-dir ${top_builddir}/src/backend/xml
TESTS_ENVIRONMENT = \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
GNC_TEST_FILES=${srcdir}/test-files/xml2 \
SRCDIR=${srcdir} \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_LTLIBRARIES = libgnc-test-file-stuff.la
Modified: gnucash/branches/2.4/src/backend/xml/test/test-load-example-account.c
===================================================================
--- gnucash/branches/2.4/src/backend/xml/test/test-load-example-account.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/backend/xml/test/test-load-example-account.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -117,6 +117,7 @@
int
main (int argc, char ** argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile (argc, argv, guile_main, NULL);
exit(get_rv());
}
Modified: gnucash/branches/2.4/src/backend/xml/test/test-xml-commodity.c
===================================================================
--- gnucash/branches/2.4/src/backend/xml/test/test-xml-commodity.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/backend/xml/test/test-xml-commodity.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -232,6 +232,7 @@
int
main(int argc, char **argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
gnc_engine_init(argc, argv);
book = qof_book_new ();
Modified: gnucash/branches/2.4/src/business/business-core/test/test-business.c
===================================================================
--- gnucash/branches/2.4/src/business/business-core/test/test-business.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/business/business-core/test/test-business.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -133,6 +133,7 @@
int
main (int argc, char **argv)
{
- // scm_boot_guile (argc, argv, main_helper, NULL);
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
+ // scm_boot_guile (argc, argv, main_helper, NULL);
return get_rv();
}
Modified: gnucash/branches/2.4/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/engine/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/engine/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -53,10 +53,13 @@
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
- --library-dir ${top_builddir}/src/engine
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql
TESTS_ENVIRONMENT = \
SRCDIR=${srcdir} \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
Modified: gnucash/branches/2.4/src/engine/test/test-create-account.scm
===================================================================
--- gnucash/branches/2.4/src/engine/test/test-create-account.scm 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/engine/test/test-create-account.scm 2011-12-09 23:11:26 UTC (rev 21698)
@@ -4,6 +4,7 @@
(use-modules (gnucash gnc-module))
(define (run-test)
+ (setenv "GNC_UNINSTALLED" "1")
(gnc:module-system-init)
(gnc:module-load "gnucash/engine" 0)
@@ -16,3 +17,4 @@
(xaccAccountCommitEdit acct)
(gnc-account-append-child root acct))
#t)
+
Modified: gnucash/branches/2.4/src/engine/test/test-scm-query-import.scm
===================================================================
--- gnucash/branches/2.4/src/engine/test/test-scm-query-import.scm 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/engine/test/test-scm-query-import.scm 2011-12-09 23:11:26 UTC (rev 21698)
@@ -4,6 +4,7 @@
(use-modules (gnucash gnc-module))
(define (run-test)
+ (setenv "GNC_UNINSTALLED" "1")
(gnc:module-system-init)
(gnc:module-load "gnucash/engine" 0)
Modified: gnucash/branches/2.4/src/engine/test/test-scm-query.c
===================================================================
--- gnucash/branches/2.4/src/engine/test/test-scm-query.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/engine/test/test-scm-query.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -79,6 +79,7 @@
int
main (int argc, char **argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile (argc, argv, main_helper, NULL);
return 0;
}
Modified: gnucash/branches/2.4/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/gnome-utils/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -18,10 +18,19 @@
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
- --library-dir ${top_builddir}/src/gnc-module
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils
+
TESTS_ENVIRONMENT = \
+ SRCDIR=${srcdir} \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
Modified: gnucash/branches/2.4/src/gnome-utils/test/test-link-module.c
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/test/test-link-module.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/gnome-utils/test/test-link-module.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -5,14 +5,17 @@
static void
guile_main(void *closure, int argc, char ** argv)
{
+ GNCModule mod;
gnc_module_system_init();
- /* gnc_module_load("gnucash/gnome-utils", 0); */
- exit(0);
+ mod = gnc_module_load("gnucash/gnome-utils", 0);
+
+ exit(mod == NULL);
}
int
main(int argc, char ** argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile(argc, argv, guile_main, NULL);
return 0;
}
Modified: gnucash/branches/2.4/src/gnome-utils/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/gnome-utils/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -2,10 +2,17 @@
exec guile -s $0
!#
+(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
(display " testing gnome-utils module load ... ")
-(gnc:module-load "gnucash/gnome-utils" 0)
+(if (gnc:module-load "gnucash/gnome-utils" 0)
-(display " ok\n")
+ (begin
+ (display "ok\n")
+ (exit 0))
+ (begin
+ (display "failed\n")
+ (exit 1)))
+
Modified: gnucash/branches/2.4/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/import-export/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -34,9 +34,20 @@
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/app-utils \
- --guile-load-dir ${top_builddir}/src/gnome-utils
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+\
+ --library-dir ${top_builddir}/src/libqof/qof \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
Modified: gnucash/branches/2.4/src/import-export/test/test-import-parse.c
===================================================================
--- gnucash/branches/2.4/src/import-export/test/test-import-parse.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/import-export/test/test-import-parse.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -185,6 +185,7 @@
int
main(int argc, char **argv)
{
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile(argc, argv, main_helper, NULL);
return 0;
}
Modified: gnucash/branches/2.4/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/report-gnome/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-gnome/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,3 +1,17 @@
+AM_CPPFLAGS = \
+ -I${top_srcdir} \
+ -I${top_srcdir}/src \
+ -I${top_srcdir}/src/test-core \
+ -I${top_srcdir}/src/libqof/qof \
+ -I${top_srcdir}/src/gnc-module \
+ ${GUILE_INCS} \
+ ${GLIB_CFLAGS}
+
+LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
+ ${GLIB_LIBS}
+
TESTS = \
test-link-module \
test-load-module
@@ -10,25 +24,31 @@
--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/report-gnome \
+\
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/core-utils \
--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/utility-reports \
--guile-load-dir ${top_builddir}/src/report/report-gnome \
- --guile-load-dir ${top_builddir}/src/engine \
+\
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/xml \
- --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/backend/sql \
--library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/html \
--library-dir ${top_builddir}/src/report/report-system
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
Modified: gnucash/branches/2.4/src/report/report-gnome/test/test-link-module.c
===================================================================
--- gnucash/branches/2.4/src/report/report-gnome/test/test-link-module.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-gnome/test/test-link-module.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,7 +1,24 @@
#include <stdlib.h>
+#include <libguile.h>
+#include <gnc-module.h>
+static void
+guile_main(void *closure, int argc, char ** argv)
+{
+ GNCModule mod;
+ gnc_module_system_init();
+ mod = gnc_module_load("gnucash/report/report-gnome", 0);
+
+ exit(mod == NULL);
+}
+
int
main(int argc, char ** argv)
{
- exit(0);
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
+ scm_boot_guile(argc, argv, guile_main, NULL);
+ return 0;
}
+
+
+
Modified: gnucash/branches/2.4/src/report/report-gnome/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/report/report-gnome/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-gnome/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -14,6 +14,7 @@
(gnc:module-system-init)
+(setenv "GNC_UNINSTALLED" "1")
(if (gnc:module-load "gnucash/report/report-gnome" 0)
(begin
(display "ok\n")
Modified: gnucash/branches/2.4/src/report/report-system/gnc-report.c
===================================================================
--- gnucash/branches/2.4/src/report/report-system/gnc-report.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-system/gnc-report.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -205,10 +205,12 @@
const gchar* default_font_family;
top_list = gtk_window_list_toplevels();
+ g_return_val_if_fail (top_list != NULL, NULL);
top_widget = GTK_WIDGET(top_list->data);
g_list_free(top_list);
top_widget_style = gtk_rc_get_style(top_widget);
- default_font_family = pango_font_description_get_family(top_widget_style->font_desc);
+ default_font_family =
+ pango_font_description_get_family(top_widget_style->font_desc);
if (default_font_family == NULL)
return g_strdup("Arial");
Modified: gnucash/branches/2.4/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/report-system/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-system/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,3 +1,17 @@
+AM_CPPFLAGS = \
+ -I${top_srcdir} \
+ -I${top_srcdir}/src \
+ -I${top_srcdir}/src/test-core \
+ -I${top_srcdir}/src/libqof/qof \
+ -I${top_srcdir}/src/gnc-module \
+ ${GUILE_INCS} \
+ ${GLIB_CFLAGS}
+
+LDADD = \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
+ ${GLIB_LIBS}
+
TESTS = \
test-link-module \
test-load-module
@@ -8,6 +22,7 @@
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
+\
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/src/engine \
@@ -15,16 +30,25 @@
--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 \
+\
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
- --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/src/app-utils
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module
+
+testit:
+ $(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
\ No newline at end of file
Modified: gnucash/branches/2.4/src/report/report-system/test/test-link-module.c
===================================================================
--- gnucash/branches/2.4/src/report/report-system/test/test-link-module.c 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-system/test/test-link-module.c 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,7 +1,22 @@
#include <stdlib.h>
+#include <libguile.h>
+#include <gnc-module.h>
+static void
+guile_main(void *closure, int argc, char ** argv)
+{
+ GNCModule mod;
+ gnc_module_system_init();
+ mod = gnc_module_load("gnucash/report/report-system", 0);
+
+ exit(mod == NULL);
+}
+
int
main(int argc, char ** argv)
{
- exit(0);
+ g_setenv ("GNC_UNINSTALLED", "1", TRUE);
+ scm_boot_guile(argc, argv, guile_main, NULL);
+ return 0;
}
+
Modified: gnucash/branches/2.4/src/report/report-system/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/report/report-system/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/report-system/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -9,6 +9,7 @@
(debug-set! maxdepth 10000)
(display " testing report module load ... ")
+(setenv "GNC_UNINSTALLED" "1")
(use-modules (ice-9 syncase))
(use-modules (gnucash gnc-module))
Modified: gnucash/branches/2.4/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/standard-reports/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/standard-reports/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -7,6 +7,7 @@
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
+\
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/src/engine \
@@ -15,13 +16,20 @@
--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 \
+\
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
- --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/src/app-utils
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
+ --library-dir ${top_builddir}/src/gnc-module
+
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
Modified: gnucash/branches/2.4/src/report/standard-reports/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/report/standard-reports/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/standard-reports/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -3,6 +3,7 @@
!#
(display " testing standard report module load ... ")
+(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
Modified: gnucash/branches/2.4/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/stylesheets/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/stylesheets/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -1,21 +1,37 @@
TESTS=test-load-module
GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
+ --gnc-module-dir ${top_builddir}/src/calculation \
+\
--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/core-utils \
+ --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/stylesheets \
+\
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/html \
--library-dir ${top_builddir}/src/report/report-system \
--library-dir ${top_builddir}/src/report/report-gnome
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
Modified: gnucash/branches/2.4/src/report/stylesheets/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/report/stylesheets/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/stylesheets/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -2,6 +2,7 @@
exec guile -s "$0"
!#
+(setenv "GNC_UNINSTALLED" "1")
(display " testing stylesheet module load ... ")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
Modified: gnucash/branches/2.4/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/utility-reports/test/Makefile.am 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/utility-reports/test/Makefile.am 2011-12-09 23:11:26 UTC (rev 21698)
@@ -7,6 +7,7 @@
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
+\
--guile-load-dir ${top_builddir}/src/gnc-module \
--guile-load-dir ${top_builddir}/src/scm \
--guile-load-dir ${top_builddir}/src/engine \
@@ -15,10 +16,19 @@
--guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/report/utility-reports \
+\
+ --library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/xml \
+ --library-dir ${top_builddir}/src/backend/sql \
--library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT = \
+ GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
Modified: gnucash/branches/2.4/src/report/utility-reports/test/test-load-module
===================================================================
--- gnucash/branches/2.4/src/report/utility-reports/test/test-load-module 2011-12-09 23:11:09 UTC (rev 21697)
+++ gnucash/branches/2.4/src/report/utility-reports/test/test-load-module 2011-12-09 23:11:26 UTC (rev 21698)
@@ -3,6 +3,7 @@
!#
(display " testing utility report module load ... ")
+(setenv "GNC_UNINSTALLED" "1")
(use-modules (gnucash gnc-module))
(gnc:module-system-init)
More information about the gnucash-changes
mailing list