gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/3c57c440 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a71d8417 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1ce1aff0 (commit)



commit 3c57c440784208d8b59c4a9539d9102e6aff84a4
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Jan 12 19:19:37 2017 +0100

    Enable google test on travis
    
    This enables a number of additional unit tests.
    Unfortunately several of them fail on travis and need
    some more attention.

diff --git a/.travis.yml b/.travis.yml
index b7fad01..2224d11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,5 @@ install:
   - sudo apt-get install -qq swig
   - sudo apt-get install -qq libboost-all-dev
   - sudo apt-get --reinstall install -qq language-pack-en language-pack-fr
-script: ./autogen.sh && ./configure && make && TZ="America/Los_Angeles" make check
+  - git clone https://github.com/google/googletest ~/gtest
+script: ./autogen.sh && ./configure GTEST_ROOT=~/gtest/googletest GMOCK_ROOT=~/gtest/googlemock && make && TZ="America/Los_Angeles" make check
diff --git a/configure.ac b/configure.ac
index 76df6ea..0238b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -951,6 +951,7 @@ if test x$enable_google_test = xyes; then
    else
       if test -n "${GMOCK_ROOT}" -a -r "${GMOCK_ROOT}/src/gmock-all.cc"; then
          ac_cv_gmock_src_path=${GMOCK_ROOT}/src
+	 ac_cv_gmock_root=${GMOCK_ROOT}
       elif test "x$ac_cv_gtest_system_install" = "xyes"; then
          if test "x$ac_cv_file__usr_src_gmock_src_gmock_all_cc" = xyes; then
             ac_cv_gmock_src_path="/usr/src/gmock/src"

commit a71d8417c6343ea227f6f887c536a4f797ae199d
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Jan 12 19:14:02 2017 +0100

    Fix signedness of certain gmock based tests

diff --git a/src/libqof/qof/test/test-kvp-frame.cpp b/src/libqof/qof/test/test-kvp-frame.cpp
index 0c99330..92c68b8 100644
--- a/src/libqof/qof/test/test-kvp-frame.cpp
+++ b/src/libqof/qof/test/test-kvp-frame.cpp
@@ -151,7 +151,7 @@ TEST_F (KvpFrameTest, GetKeys)
     auto k3 = "second";
 
     auto keys = t_root.get_keys ();
-    EXPECT_EQ (keys.size (), 1);
+    EXPECT_EQ (keys.size (), 1ul);
 
     assert_contains (keys, k1);
     auto frameval = t_root.get_slot(k1);



Summary of changes:
 .travis.yml                            | 3 ++-
 configure.ac                           | 1 +
 src/libqof/qof/test/test-kvp-frame.cpp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)