r22511 - gnucash/trunk/src/backend/dbi/test - Fix backend-dbi tests to run from a separate build directory

[John Ralls]

Author: jralls
Date: 2012-11-02 18:21:23 -0400 (Fri, 02 Nov 2012)
New Revision: 22511
Trac: http://svn.gnucash.org/trac/changeset/22511

Modified:
   gnucash/trunk/src/backend/dbi/test/Makefile.am
   gnucash/trunk/src/backend/dbi/test/test-backend-dbi.c
   gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
   gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-business.c
Log:
Fix backend-dbi tests to run from a separate build directory

Include asserts to fail immediately if either the dbi or xml backends
fail to load.

Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am	2012-11-02 19:54:31 UTC (rev 22510)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am	2012-11-02 22:21:23 UTC (rev 22511)
@@ -26,6 +26,7 @@
         ${top_builddir}/src/libqof/qof/libgnc-qof.la \
         ../libgncmod-backend-dbi.la \
         ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
+        ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
 GNC_TEST_DEPS = \
@@ -34,13 +35,14 @@
   --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
 
 TESTS_ENVIRONMENT = \
   GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
   SRCDIR=${srcdir} \
   ${gnc_dbd_dir_override} \
-  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+  $(shell ${top_srcdir}/src/gnc-test-env ${GNC_TEST_DEPS})
 
 EXTRA_DIST += \
     test-dbi-stuff.h \
@@ -64,7 +66,10 @@
     test-dbi-business-stuff.c
 
 test_backend_dbi_LDFLAGS="-ldbi"
+test_backend_dbi_CPPFLAGS=-DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\"
 
+
+
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
 
 # If you let make run parallel builds it complains that there is no rule to make

Modified: gnucash/trunk/src/backend/dbi/test/test-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-backend-dbi.c	2012-11-02 19:54:31 UTC (rev 22510)
+++ gnucash/trunk/src/backend/dbi/test/test-backend-dbi.c	2012-11-02 22:21:23 UTC (rev 22511)
@@ -41,8 +41,9 @@
     g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
     qof_init();
     cashobjects_register();
-    qof_load_backend_library ("../.libs/", GNC_LIB_NAME);
-    qof_load_backend_library ("../../xml/.libs", "gncmod-backend-xml");
+    g_assert (qof_load_backend_library ("../.libs/", GNC_LIB_NAME));
+    g_assert (qof_load_backend_library ("../../xml/.libs",
+					"gncmod-backend-xml"));
 
 
     test_suite_gnc_backend_dbi_basic();

Modified: gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2012-11-02 19:54:31 UTC (rev 22510)
+++ gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2012-11-02 22:21:23 UTC (rev 22511)
@@ -20,8 +20,6 @@
 void do_test_mysql(void);
 void do_test_pgsql(void);
 
-#define DBI_TEST_XML_FILENAME "test-dbi.xml"
-
 typedef struct
 {
      QofSession *session;

Modified: gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-business.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-business.c	2012-11-02 19:54:31 UTC (rev 22510)
+++ gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-business.c	2012-11-02 22:21:23 UTC (rev 22511)
@@ -43,9 +43,6 @@
 
 void do_test_business_sqlite(void);
 
-#define DBI_TEST_XML_FILENAME "test-dbi.xml"
-#define FILE_NAME "sqlite3:///tmp/test-sqlite3-file"
-#define GNC_LIB_NAME "gncmod-backend-dbi"
 #include "config.h"
 #include "qof.h"
 #include "cashobjects.h"