gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Dec 8 00:59:52 EST 2014


Updated	 via  https://github.com/Gnucash/gnucash/commit/c5d87ec3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0c474143 (commit)
	from  https://github.com/Gnucash/gnucash/commit/85c1b229 (commit)



commit c5d87ec3b64515b1e6c5176f956fb1745266b3a1
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 7 21:59:26 2014 -0800

    Work around bug in some versions of gtest which error out on EXPECT_EQ (false, foo).
    
    A problem version is shipped by Debian Wheezy; Debian Jessie has a working version.

diff --git a/src/libqof/qof/test/gtest-gnc-int128.cpp b/src/libqof/qof/test/gtest-gnc-int128.cpp
index b8a121e..02b7476 100644
--- a/src/libqof/qof/test/gtest-gnc-int128.cpp
+++ b/src/libqof/qof/test/gtest-gnc-int128.cpp
@@ -27,121 +27,121 @@
 TEST(qofint128_constructors, test_default_constructor)
 {
     GncInt128 value {};
-    EXPECT_EQ (true, value.isZero());
-    EXPECT_EQ (false, value.isNeg());
-    EXPECT_EQ (false, value.isBig());
-    EXPECT_EQ (false, value.isOverflow());
-    EXPECT_EQ (false, value.isNan());
+    EXPECT_TRUE (value.isZero());
+    EXPECT_FALSE (value.isNeg());
+    EXPECT_FALSE (value.isBig());
+    EXPECT_FALSE (value.isOverflow());
+    EXPECT_FALSE (value.isNan());
 }
 
 TEST(qofint128_constructors, test_single_arg_constructor)
 {
     GncInt128 value1 (INT64_C(0));
-    EXPECT_EQ (true, value1.isZero());
-    EXPECT_EQ (false, value1.isNeg());
-    EXPECT_EQ (false, value1.isBig());
-    EXPECT_EQ (false, value1.isOverflow());
-    EXPECT_EQ (false, value1.isNan());
+    EXPECT_TRUE (value1.isZero());
+    EXPECT_FALSE (value1.isNeg());
+    EXPECT_FALSE (value1.isBig());
+    EXPECT_FALSE (value1.isOverflow());
+    EXPECT_FALSE (value1.isNan());
 
     GncInt128 value2 (INT64_C(567894392130486208));
-    EXPECT_EQ (false, value2.isZero());
-    EXPECT_EQ (false, value2.isNeg());
-    EXPECT_EQ (false, value2.isBig());
-    EXPECT_EQ (false, value2.isOverflow());
-    EXPECT_EQ (false, value2.isNan());
+    EXPECT_FALSE (value2.isZero());
+    EXPECT_FALSE (value2.isNeg());
+    EXPECT_FALSE (value2.isBig());
+    EXPECT_FALSE (value2.isOverflow());
+    EXPECT_FALSE (value2.isNan());
 
     GncInt128 value3 (INT64_C(-567894392130486208));
-    EXPECT_EQ (false, value3.isZero());
-    EXPECT_EQ (true, value3.isNeg());
-    EXPECT_EQ (false, value3.isBig());
-    EXPECT_EQ (false, value3.isOverflow());
-    EXPECT_EQ (false, value3.isNan());
+    EXPECT_FALSE (value3.isZero());
+    EXPECT_TRUE (value3.isNeg());
+    EXPECT_FALSE (value3.isBig());
+    EXPECT_FALSE (value3.isOverflow());
+    EXPECT_FALSE (value3.isNan());
 
     GncInt128 value4 (UINT64_C(13567894392130486208));
-    EXPECT_EQ (false, value4.isZero());
-    EXPECT_EQ (false, value4.isNeg());
-    EXPECT_EQ (true, value4.isBig());
-    EXPECT_EQ (false, value4.isOverflow());
-    EXPECT_EQ (false, value4.isNan());
+    EXPECT_FALSE (value4.isZero());
+    EXPECT_FALSE (value4.isNeg());
+    EXPECT_TRUE (value4.isBig());
+    EXPECT_FALSE (value4.isOverflow());
+    EXPECT_FALSE (value4.isNan());
 }
 
 TEST(qofint128_constructors, test_double_arg_constructor)
 {
     GncInt128 value1 (INT64_C(0), INT64_C(0));
-    EXPECT_EQ (true, value1.isZero());
-    EXPECT_EQ (false, value1.isNeg());
-    EXPECT_EQ (false, value1.isBig());
-    EXPECT_EQ (false, value1.isOverflow());
-    EXPECT_EQ (false, value1.isNan());
+    EXPECT_TRUE (value1.isZero());
+    EXPECT_FALSE (value1.isNeg());
+    EXPECT_FALSE (value1.isBig());
+    EXPECT_FALSE (value1.isOverflow());
+    EXPECT_FALSE (value1.isNan());
 
     GncInt128 value2 (INT64_C(0), INT64_C(567894392130486208));
-    EXPECT_EQ (false, value2.isZero());
-    EXPECT_EQ (false, value2.isNeg());
-    EXPECT_EQ (false, value2.isBig());
-    EXPECT_EQ (false, value2.isOverflow());
-    EXPECT_EQ (false, value2.isNan());
+    EXPECT_FALSE (value2.isZero());
+    EXPECT_FALSE (value2.isNeg());
+    EXPECT_FALSE (value2.isBig());
+    EXPECT_FALSE (value2.isOverflow());
+    EXPECT_FALSE (value2.isNan());
 
     GncInt128 value3 (INT64_C(567894392130486208), INT64_C(0));
-    EXPECT_EQ (false, value3.isZero());
-    EXPECT_EQ (false, value3.isNeg());
-    EXPECT_EQ (true, value3.isBig());
-    EXPECT_EQ (false, value3.isOverflow());
-    EXPECT_EQ (false, value3.isNan());
+    EXPECT_FALSE (value3.isZero());
+    EXPECT_FALSE (value3.isNeg());
+    EXPECT_TRUE (value3.isBig());
+    EXPECT_FALSE (value3.isOverflow());
+    EXPECT_FALSE (value3.isNan());
 
     GncInt128 value4 (INT64_C(567894392130486208), INT64_C(567894392130486208));
-    EXPECT_EQ (false, value4.isZero());
-    EXPECT_EQ (false, value4.isNeg());
-    EXPECT_EQ (true, value4.isBig());
-    EXPECT_EQ (false, value4.isOverflow());
-    EXPECT_EQ (false, value4.isNan());
+    EXPECT_FALSE (value4.isZero());
+    EXPECT_FALSE (value4.isNeg());
+    EXPECT_TRUE (value4.isBig());
+    EXPECT_FALSE (value4.isOverflow());
+    EXPECT_FALSE (value4.isNan());
 
     GncInt128 value5 (INT64_C(567894392130486208),
                       INT64_C(-567894392130486208));
-    EXPECT_EQ (false, value5.isZero());
-    EXPECT_EQ (false, value5.isNeg());
-    EXPECT_EQ (true, value5.isBig());
-    EXPECT_EQ (false, value5.isOverflow());
-    EXPECT_EQ (false, value5.isNan());
+    EXPECT_FALSE (value5.isZero());
+    EXPECT_FALSE (value5.isNeg());
+    EXPECT_TRUE (value5.isBig());
+    EXPECT_FALSE (value5.isOverflow());
+    EXPECT_FALSE (value5.isNan());
 
     GncInt128 value6 (INT64_C(-567894392130486208),
                       INT64_C(567894392130486208));
-    EXPECT_EQ (false, value6.isZero());
-    EXPECT_EQ (true, value6.isNeg());
-    EXPECT_EQ (true, value6.isBig());
-    EXPECT_EQ (false, value6.isOverflow());
-    EXPECT_EQ (false, value6.isNan());
+    EXPECT_FALSE (value6.isZero());
+    EXPECT_TRUE (value6.isNeg());
+    EXPECT_TRUE (value6.isBig());
+    EXPECT_FALSE (value6.isOverflow());
+    EXPECT_FALSE (value6.isNan());
 
     GncInt128 value7 (UINT64_C(13567894392130486208),
                       UINT64_C(13567894392130486208), GncInt128::pos);
-    EXPECT_EQ (false, value7.isZero());
-    EXPECT_EQ (false, value7.isNeg());
-    EXPECT_EQ (true, value7.isBig());
-    EXPECT_EQ (false, value7.isOverflow());
-    EXPECT_EQ (false, value7.isNan());
+    EXPECT_FALSE (value7.isZero());
+    EXPECT_FALSE (value7.isNeg());
+    EXPECT_TRUE (value7.isBig());
+    EXPECT_FALSE (value7.isOverflow());
+    EXPECT_FALSE (value7.isNan());
 
     GncInt128 value8 (UINT64_C(13567894392130486208),
                       UINT64_C(13567894392130486208), GncInt128::neg);
-    EXPECT_EQ (false, value8.isZero());
-    EXPECT_EQ (true, value8.isNeg());
-    EXPECT_EQ (true, value8.isBig());
-    EXPECT_EQ (false, value8.isOverflow());
-    EXPECT_EQ (false, value8.isNan());
+    EXPECT_FALSE (value8.isZero());
+    EXPECT_TRUE (value8.isNeg());
+    EXPECT_TRUE (value8.isBig());
+    EXPECT_FALSE (value8.isOverflow());
+    EXPECT_FALSE (value8.isNan());
 
     GncInt128 value9 (UINT64_C(13567894392130486208),
                       UINT64_C(13567894392130486208), GncInt128::overflow);
-    EXPECT_EQ (false, value9.isZero());
-    EXPECT_EQ (false, value9.isNeg());
-    EXPECT_EQ (true, value9.isBig());
-    EXPECT_EQ (true, value9.isOverflow());
-    EXPECT_EQ (false, value9.isNan());
+    EXPECT_FALSE (value9.isZero());
+    EXPECT_FALSE (value9.isNeg());
+    EXPECT_TRUE (value9.isBig());
+    EXPECT_TRUE (value9.isOverflow());
+    EXPECT_FALSE (value9.isNan());
 
    GncInt128 value10 (UINT64_C(13567894392130486208),
                       UINT64_C(13567894392130486208), GncInt128::NaN);
-    EXPECT_EQ (false, value10.isZero());
-    EXPECT_EQ (false, value10.isNeg());
-    EXPECT_EQ (true, value10.isBig());
-    EXPECT_EQ (false, value10.isOverflow());
-    EXPECT_EQ (true, value10.isNan());
+    EXPECT_FALSE (value10.isZero());
+    EXPECT_FALSE (value10.isNeg());
+    EXPECT_TRUE (value10.isBig());
+    EXPECT_FALSE (value10.isOverflow());
+    EXPECT_TRUE (value10.isNan());
 }
 
 TEST(qofint128_functions, test_int_functions)

commit 0c4741436478db438eb0cdb7f6737ae5088228b9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 7 21:57:49 2014 -0800

    Make the gtest section fail properly when presented with the broken Fedora installation of gtest.
    
    Fedora users will need to install sources and pass --gtest-root and --gmock-root to configure.

diff --git a/configure.ac b/configure.ac
index 139c8e1..add19e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -778,6 +778,12 @@ if test x$enable_google_test = xyes; then
    AC_CHECK_FILES([/usr/src/gtest/src/gtest-all.cc /usr/src/gmock/src/gmock-all.cc /usr/include/gtest/gtest.h /usr/include/gmock/gmock.h],
     [ac_cv_gtest_system_install=yes],[ac_cv_gtest_system_install=no])
 fi
+if test x$ac_cv_file__usr_include_gmock_gmock_h = xyes -a x$ac_cv_file__usr_include_gtest_gtest_h = xyes -a x$ac_cv_file__usr_src_gmock_src_gmock_all_cc = xyes -a x$ac_cv_file__usr_src_gtest_src_gtest_all_cc = xyes; then
+  ac_cv_gtest_system_install=yes
+else
+  ac_cv_gtest_system_install=no
+fi
+
 AC_ARG_WITH([gtest-root],
     [AS_HELP_STRING([--with-gtest-root=PATH], [location of the google test sources])],
     [ac_cv_gtest_root="$with_gtest_root"])



Summary of changes:
 configure.ac                             |   6 ++
 src/libqof/qof/test/gtest-gnc-int128.cpp | 150 +++++++++++++++----------------
 2 files changed, 81 insertions(+), 75 deletions(-)



More information about the gnucash-changes mailing list