gnucash master: Add CPPFLAGS and LD_ADD to the date/time gtests.

John Ralls jralls at code.gnucash.org
Thu Jun 2 15:44:51 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/dfc0166d (commit)
	from  https://github.com/Gnucash/gnucash/commit/b92eff26 (commit)



commit dfc0166d920cde6a21b35e1837896c010cde8807
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jun 2 12:44:38 2016 -0700

    Add CPPFLAGS and LD_ADD to the date/time gtests.
    
    Required because of using qoflog in gnc-timezone.cpp.
    Also fix an extraneous std::move in gtest-gnc-datetime.cpp.

diff --git a/src/libqof/qof/test/Makefile.am b/src/libqof/qof/test/Makefile.am
index 1ad5693..5bfcb0f 100644
--- a/src/libqof/qof/test/Makefile.am
+++ b/src/libqof/qof/test/Makefile.am
@@ -74,9 +74,14 @@ test_gnc_timezone_SOURCES = \
 
 test_gnc_timezone_CPPFLAGS = \
         -I${GTEST_HEADERS} \
-	-I${top_srcdir}/src \
-	$(BOOST_CPPFLAGS)
-test_gnc_timezone_LDADD = $(GTEST_LIBS)
+        -I$(top_srcdir)/$(MODULEPATH) \
+        $(GLIB_CFLAGS) \
+        $(BOOST_CPPFLAGS)
+
+test_gnc_timezone_LDADD = \
+	${top_builddir}/${MODULEPATH}/libgnc-qof.la \
+	$(GLIB_LIBS) \
+        $(GTEST_LIBS)
 if !GOOGLE_TEST_LIBS
 nodist_test_gnc_timezone_SOURCES = \
         ${GTEST_SRC}/src/gtest_main.cc
@@ -87,12 +92,18 @@ test_gnc_datetime_SOURCES = \
 	$(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \
 	$(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \
 	gtest-gnc-datetime.cpp
+
 test_gnc_datetime_CPPFLAGS =\
-	-I$(GTEST_HEADERS) \
-	-I$(top_srcdir)/src \
-	$(BOOST_CPPFLAGS)
+        -I$(GTEST_HEADERS) \
+        -I$(top_srcdir)/$(MODULEPATH) \
+        -I$(top_srcdir)/src \
+        $(GLIB_CFLAGS) \
+        $(BOOST_CPPFLAGS)
+
 test_gnc_datetime_LDADD = \
 	-lboost_date_time \
+	${top_builddir}/${MODULEPATH}/libgnc-qof.la \
+	$(GLIB_LIBS) \
 	$(GTEST_LIBS)
 if !GOOGLE_TEST_LIBS
 nodist_test_gnc_datetime_SOURCES = \
diff --git a/src/libqof/qof/test/gtest-gnc-datetime.cpp b/src/libqof/qof/test/gtest-gnc-datetime.cpp
index 2f6e000..9d1b3cf 100644
--- a/src/libqof/qof/test/gtest-gnc-datetime.cpp
+++ b/src/libqof/qof/test/gtest-gnc-datetime.cpp
@@ -81,7 +81,7 @@ TEST(gnc_datetime_functions, test_format)
 TEST(gnc_datetime_functions, test_date)
 {
     GncDateTime atime(2394187200); //2045-11-13 12:00:00 Z
-    GncDate gncd = std::move(atime.date());
+    GncDate gncd = atime.date();
     auto ymd = gncd.year_month_day();
     EXPECT_EQ(ymd.year, 2045);
     EXPECT_EQ(ymd.month, 11);



Summary of changes:
 src/libqof/qof/test/Makefile.am            | 23 +++++++++++++++++------
 src/libqof/qof/test/gtest-gnc-datetime.cpp |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)



More information about the gnucash-changes mailing list