gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/118af3e9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/333edb19 (commit)
	from  https://github.com/Gnucash/gnucash/commit/449d3ca3 (commit)



commit 118af3e9e9d0bbf03b4babdcf4e66bfae3f88a9c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Sep 5 14:14:01 2017 +0200

    Fix gtest-gnc-timezone test on Windows

diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
index 5c505c3..b73b085 100644
--- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
+++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
@@ -39,7 +39,7 @@ TEST(gnc_timezone_constructors, test_default_constructor)
 TEST(gnc_timezone_constructors, test_pacific_time_constructor)
 {
 #if PLATFORM(WINDOWS)
-    std::string timzone("Pacific Standard Time");
+    std::string timezone("Pacific Standard Time");
 #else
     std::string timezone("America/Los_Angeles");
 #endif

commit 333edb190010ceed8fa206b25b6b0fbced6f2350
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Sep 5 00:50:26 2017 +0200

    Fix gnc-rational test on Windows

diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 32ba365..bd6bd45 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -110,7 +110,17 @@ SET(gtest_engine_INCLUDES
   ${CMAKE_BINARY_DIR}/common # for config.h
   ${CMAKE_SOURCE_DIR}/common # for platform.h
   ${GLIB2_INCLUDE_DIRS}
-  ${GTEST_INCLUDE_DIR})
+  ${GTEST_INCLUDE_DIR}
+  ../../../borrowed/libc
+)
+
+IF (WIN32)
+  ADD_DEFINITIONS (-DOS_WIN32)
+  SET (gtest_engine_win32_SOURCES
+    ${MODULEPATH}/qof-win32.cpp
+    ../../../borrowed/libc/strptime.c
+  )
+ENDIF (WIN32)
 
 SET(test_gnc_guid_SOURCES
   ${MODULEPATH}/guid.cpp
@@ -149,8 +159,10 @@ SET(test_gnc_rational_SOURCES
   ${MODULEPATH}/gnc-timezone.cpp
   ${MODULEPATH}/gnc-date.cpp
   ${MODULEPATH}/qoflog.cpp
+  ${gtest_engine_win32_SOURCES}
   gtest-gnc-rational.cpp
   ${GTEST_SRC})
+
 GNC_ADD_TEST(test-gnc-rational "${test_gnc_rational_SOURCES}"
   gtest_engine_INCLUDES gtest_qof_LIBS)
 
@@ -162,6 +174,7 @@ SET(test_gnc_numeric_SOURCES
   ${MODULEPATH}/gnc-timezone.cpp
   ${MODULEPATH}/gnc-date.cpp
   ${MODULEPATH}/qoflog.cpp
+  ${gtest_engine_win32_SOURCES}
   gtest-gnc-numeric.cpp
   ${GTEST_SRC})
 GNC_ADD_TEST(test-gnc-numeric "${test_gnc_numeric_SOURCES}"
@@ -179,6 +192,7 @@ SET(test_gnc_datetime_SOURCES
   ${MODULEPATH}/gnc-timezone.cpp
   ${MODULEPATH}/gnc-date.cpp
   ${MODULEPATH}/qoflog.cpp
+  ${gtest_engine_win32_SOURCES}
   gtest-gnc-datetime.cpp
   ${GTEST_SRC})
 GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}"



Summary of changes:
 libgnucash/engine/test/CMakeLists.txt         | 16 +++++++++++++++-
 libgnucash/engine/test/gtest-gnc-timezone.cpp |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)