r23180 - gnucash/trunk/src/backend/dbi/test - Bug #654196 make check fails without sqlite DBD installed

John Ralls jralls at code.gnucash.org
Thu Sep 19 17:29:54 EDT 2013


Author: jralls
Date: 2013-09-19 17:29:53 -0400 (Thu, 19 Sep 2013)
New Revision: 23180
Trac: http://svn.gnucash.org/trac/changeset/23180

Modified:
   gnucash/trunk/src/backend/dbi/test/test-backend-dbi-basic.c
Log:
Bug #654196 make check fails without sqlite DBD installed

Test for dbd driver for each backend before trying to test that backend

Modified: gnucash/trunk/src/backend/dbi/test/test-backend-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-backend-dbi-basic.c	2013-09-19 19:23:13 UTC (rev 23179)
+++ gnucash/trunk/src/backend/dbi/test/test-backend-dbi-basic.c	2013-09-19 21:29:53 UTC (rev 23180)
@@ -580,10 +580,20 @@
 void
 test_suite_gnc_backend_dbi (void)
 {
-    create_dbi_test_suite ("sqlite3", "sqlite3");
-    if (strlen (TEST_MYSQL_URL) > 0)
+    dbi_driver driver = NULL;
+    GList *drivers = NULL;
+    while ((driver = dbi_driver_list (driver)))
+    {
+	drivers = g_list_prepend (drivers,
+				  (gchar*)dbi_driver_get_name (driver));
+    }
+    if (g_list_find_custom (drivers, "sqlite3", (GCompareFunc)g_strcmp0))
+	create_dbi_test_suite ("sqlite3", "sqlite3");
+    if (strlen (TEST_MYSQL_URL) > 0 &&
+	g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0))
         create_dbi_test_suite ("mysql", TEST_MYSQL_URL);
-    if (strlen (TEST_PGSQL_URL) > 0)
+    if (strlen (TEST_PGSQL_URL) > 0 &&
+	g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0))
     {
 	g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE);
         create_dbi_test_suite ("postgres", TEST_PGSQL_URL);



More information about the gnucash-changes mailing list