IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-29 12:14:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add CPPFLAGS and LD_ADD to the date/time gtests.

Browse Source 
Required because of using qoflog in gnc-timezone.cpp.
Also fix an extraneous std::move in gtest-gnc-datetime.cpp.
This commit is contained in:
John Ralls 2016-06-02 12:44:38 -07:00
parent b92eff265a
commit dfc0166d92
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libqof/qof/test/Makefile.am
View File

@ -74,9 +74,14 @@ test_gnc_timezone_SOURCES = \
test_gnc_timezone_CPPFLAGS = \ test_gnc_timezone_CPPFLAGS = \
-I${GTEST_HEADERS} \ -I${GTEST_HEADERS} \
-I${top_srcdir}/src \ -I$(top_srcdir)/$(MODULEPATH) \
$(BOOST_CPPFLAGS) $(GLIB_CFLAGS) \
test_gnc_timezone_LDADD = $(GTEST_LIBS) $(BOOST_CPPFLAGS)
test_gnc_timezone_LDADD = \
${top_builddir}/${MODULEPATH}/libgnc-qof.la \
$(GLIB_LIBS) \
$(GTEST_LIBS)
if !GOOGLE_TEST_LIBS if !GOOGLE_TEST_LIBS
nodist_test_gnc_timezone_SOURCES = \ nodist_test_gnc_timezone_SOURCES = \
${GTEST_SRC}/src/gtest_main.cc ${GTEST_SRC}/src/gtest_main.cc
@ -87,12 +92,18 @@ test_gnc_datetime_SOURCES = \
$(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \ $(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \
$(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \ $(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \
gtest-gnc-datetime.cpp gtest-gnc-datetime.cpp
test_gnc_datetime_CPPFLAGS =\ test_gnc_datetime_CPPFLAGS =\
-I$(GTEST_HEADERS) \ -I$(GTEST_HEADERS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/$(MODULEPATH) \
$(BOOST_CPPFLAGS) -I$(top_srcdir)/src \
$(GLIB_CFLAGS) \
$(BOOST_CPPFLAGS)
test_gnc_datetime_LDADD = \ test_gnc_datetime_LDADD = \
-lboost_date_time \ -lboost_date_time \
${top_builddir}/${MODULEPATH}/libgnc-qof.la \
$(GLIB_LIBS) \
$(GTEST_LIBS) $(GTEST_LIBS)
if !GOOGLE_TEST_LIBS if !GOOGLE_TEST_LIBS
nodist_test_gnc_datetime_SOURCES = \ nodist_test_gnc_datetime_SOURCES = \

2
src/libqof/qof/test/gtest-gnc-datetime.cpp
View File

@ -81,7 +81,7 @@ TEST(gnc_datetime_functions, test_format)
TEST(gnc_datetime_functions, test_date) TEST(gnc_datetime_functions, test_date)
{ {
GncDateTime atime(2394187200); //2045-11-13 12:00:00 Z 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(); auto ymd = gncd.year_month_day();
EXPECT_EQ(ymd.year, 2045); EXPECT_EQ(ymd.year, 2045);
EXPECT_EQ(ymd.month, 11); EXPECT_EQ(ymd.month, 11);