gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/36967708 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f7dfd65b (commit)
	from  https://github.com/Gnucash/gnucash/commit/c56faffb (commit)



commit 3696770812b54e35e237adf875a87e17d7766703
Merge: c56faff f7dfd65
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 20 15:57:36 2016 -0700

    Merge branch 'maint'

diff --cc src/backend/dbi/test/Makefile.am
index a963b98,58aeb20..ffb6801
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@@ -58,12 -58,13 +57,12 @@@ gnc_dbd_dir_override = GNC_DBD_DIR="@GN
  endif
  
  test_backend_dbi_SOURCES = \
 -    test-backend-dbi.c \
 -    test-backend-dbi-basic.c \
 -    test-dbi-stuff.c \
 -    test-dbi-business-stuff.c \
 -    ../gnc-backend-dbi.c
 +    test-backend-dbi.cpp \
 +    test-backend-dbi-basic.cpp \
 +    test-dbi-stuff.cpp \
-     test-dbi-business-stuff.cpp
++    test-dbi-business-stuff.cpp \
++    ../gnc-backend-dbi.cpp
  
--test_backend_dbi_LDFLAGS="-ldbi"
  test_backend_dbi_CPPFLAGS = \
  	-DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\" \
  	${AM_CPPFLAGS}
diff --cc src/backend/dbi/test/test-backend-dbi-basic.cpp
index 1025389,ef37dc1..f81572e
--- a/src/backend/dbi/test/test-backend-dbi-basic.cpp
+++ b/src/backend/dbi/test/test-backend-dbi-basic.cpp
@@@ -626,18 -622,19 +626,17 @@@ test_adjust_sql_options_string (void
          "fred,jim,john"
      };
  
 -    size_t i;
 -    for (i = 0; i < sizeof(in) / sizeof(gchar*); i++)
 +    for (size_t i = 0; i < sizeof(in) / sizeof(char*); i++)
      {
 -        gchar *adjusted_str = adjust_sql_options_string (in[i]);
 -        g_assert_cmpstr (out[i],==,adjusted_str);
 -        g_free (adjusted_str);
 +        std::string adjusted_str = adjust_sql_options_string(in[i]);
 +        g_assert_cmpstr(out[i], ==, adjusted_str.c_str());
      }
  }
- #endif //G_OS_WIN32
  
  static void
 -create_dbi_test_suite (gchar *dbm_name, gchar *url)
 +create_dbi_test_suite (const char *dbm_name, const char *url)
  {
 -    gchar *subsuite = g_strdup_printf ("%s/%s", suitename, dbm_name);
 +    auto subsuite = g_strdup_printf ("%s/%s", suitename, dbm_name);
      GNC_TEST_ADD (subsuite, "store_and_reload", Fixture, url, setup,
                    test_dbi_store_and_reload, teardown);
      GNC_TEST_ADD (subsuite, "safe_save", Fixture, url, setup_memory,

commit f7dfd65bf9f2cb441bdb2d8767f3bcdbe0319b53
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 20 17:02:01 2016 +0000

    Fix adjust_sql_option_string test on Windows.
    
    The linkage problem was caused by the symbol appearing in
    libgncmod-backend-dbi.dll but not libgncmod-backend-dbi.dll.a.
    Incoprorating gnc-backend-dbi.c as a source file to the test program
    instead of linking its library resolved the issue.

diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index 8c5332c..58aeb20 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -23,7 +23,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
         ${top_builddir}/src/core-utils/libgnc-core-utils.la \
         ${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
@@ -62,7 +61,8 @@ test_backend_dbi_SOURCES = \
     test-backend-dbi.c \
     test-backend-dbi-basic.c \
     test-dbi-stuff.c \
-    test-dbi-business-stuff.c
+    test-dbi-business-stuff.c \
+    ../gnc-backend-dbi.c
 
 test_backend_dbi_LDFLAGS="-ldbi"
 test_backend_dbi_CPPFLAGS = \
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c
index 04cf131..ef37dc1 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.c
+++ b/src/backend/dbi/test/test-backend-dbi-basic.c
@@ -594,7 +594,7 @@ test_dbi_business_store_and_reload (Fixture *fixture, gconstpointer pData)
     qof_session_end (session_3);
     qof_session_destroy (session_3);
 }
-#ifndef G_OS_WIN32
+
 static void
 test_adjust_sql_options_string (void)
 {
@@ -630,7 +630,7 @@ test_adjust_sql_options_string (void)
         g_free (adjusted_str);
     }
 }
-#endif //G_OS_WIN32
+
 static void
 create_dbi_test_suite (gchar *dbm_name, gchar *url)
 {
@@ -675,8 +675,7 @@ test_suite_gnc_backend_dbi (void)
         g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE);
         create_dbi_test_suite ("postgres", TEST_PGSQL_URL);
     }
-#ifndef G_OS_WIN32
+
     GNC_TEST_ADD_FUNC( suitename, "adjust sql options string localtime", 
         test_adjust_sql_options_string );
-#endif //G_OS_WIN32
 }



Summary of changes:
 src/backend/dbi/test/Makefile.am                | 5 ++---
 src/backend/dbi/test/test-backend-dbi-basic.cpp | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)