Merge lp:~bregma/nux/lp-1185265 into lp:nux

[Stephen M. Webb]

moved to newer upstream google-mock release (lp: #1185265)

= Problem description =

Upstream google-mock has eliminated bundling a static library, Nux needs to build from source (just like google-test).

= The fix =

Autodetect google-mock sources and possibly an embedded copy of google-test and use them when building tests.

= Test coverage =

Nux does not FTBFS and testsuite builds and runs.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:801
http://jenkins.qa.ubuntu.com/job/nux-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Hum, after trying bzr bd in the nux branch, I see that the install target isn't good:
debian/tmp/usr/src/gmock/gtest/ is where DESTDIR is set, so we have for isntance:
debian/tmp/usr/src/gmock/gtest/lib/x86_64-linux-gnu/*libs

The version to build-dep on should be 1.6.0+svn437 rather than 1.6.0 (as we have 1.6.0-0ubuntu3 in saucy and that one doesn't ship the internal gtests).

review: Needs Fixing

[lp:~bregma/nux/lp-1185265]

804. By Stephen M. Webb on 2013-07-10

advanced google-mock version dependency

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:803
http://jenkins.qa.ubuntu.com/job/nux-ci/55/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:804
http://jenkins.qa.ubuntu.com/job/nux-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

approving globally now that new gmock is available

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-06-17 14:18:04 +0000
+++ configure.ac	2013-07-10 11:59:28 +0000
@@ -288,17 +288,9 @@
       [
         # Check for google gtest
         CHECK_GTEST
-        AS_IF([test "x$have_gtest" = "xyes"],
-          [AC_SUBST([GTEST_CPPFLAGS])],
+        AS_IF([test "x$have_gtest" != "xyes"],
           [AC_MSG_WARN([you are missing google-test, apt-get install libgtest-dev])])
 
-        # Check for googlemock
-        AC_LANG_PUSH([C++])
-        AC_CHECK_HEADER([gmock/gmock.h],
-                       [have_gmock=yes],
-                       [AC_MSG_WARN([you are missing google-mock, apt-get install google-mock])])
-        AC_LANG_POP([C++])
-
        #Check for libboost
 
         AC_LANG_PUSH([C++])

=== modified file 'debian/control'
--- debian/control	2013-01-10 08:37:00 +0000
+++ debian/control	2013-07-10 11:59:28 +0000
@@ -12,8 +12,7 @@
                libboost-dev,
                libboost-filesystem-dev,
                libboost-system-dev,
-               libgtest-dev,
-               google-mock,
+               google-mock (>= 1.6.0+svn437),
                libcairo2-dev (>= 1.9.14),
                libpng12-dev (>= 1.2.44),
                libglew-dev [!armel !armhf],

=== modified file 'debian/rules'
--- debian/rules	2012-11-20 02:43:28 +0000
+++ debian/rules	2013-07-10 11:59:28 +0000
@@ -23,9 +23,8 @@
 NUX_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+NUX_ABIVERSION[[:space:]]+//p' Nux/ABI.h )
 
 override_dh_install:
-	rm debian/tmp/usr/lib/*/*la
 	rm -rf debian/tmp/usr/share/nux/gputests/
-	dh_install --fail-missing
+	dh_install --fail-missing -X.la
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

=== modified file 'm4/gtest.m4'
--- m4/gtest.m4	2012-11-19 22:57:50 +0000
+++ m4/gtest.m4	2013-07-10 11:59:28 +0000
@@ -25,35 +25,93 @@
 
 AC_DEFUN([CHECK_GTEST],
 [
-  AC_ARG_WITH([gtest-include-path],
-              [AS_HELP_STRING([--with-gtest-include-path],
-                              [location of the Google test headers])],
-                [GTEST_CPPFLAGS="-I$withval"])
-
-  AC_ARG_WITH([gtest-source-path],
-              [AS_HELP_STRING([--with-gtest-source-path],
-                              [location of the Google test sources, defaults to /usr/src/gtest])],
-              [GTEST_SOURCE="$withval"],
-              [GTEST_SOURCE="/usr/src/gtest"])
-
-  GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
-
   AC_LANG_PUSH([C++])
-
+  PATH_SEPARATOR=:
+
+  AC_ARG_VAR([GMOCK_PREFIX],
+             [Path to Google Mock sources.])
+  AC_ARG_VAR([GMOCK_INCLUDES],
+             [Path to Google Mock headers.])
+  AC_ARG_VAR([GMOCK_CPPFLAGS],
+             [C preprocessor flags for Google Mock.])
+
+  gmock_includes=
+  gmock_prefix=/usr/src/gmock
+  AC_ARG_WITH([gmock-prefix],[
+    AS_HELP_STRING([--with-gmock-prefix],
+                   [Prefix where Google Mock is installed (default $gmock_prefix)])
+  ],[
+    gmock_prefix=$withval
+  ])
+
+  AC_ARG_WITH([gmock-includes],[
+    AS_HELP_STRING([--with-gmock-includes],
+                   [Search path for Google Mock headers (default none)])
+  ],[
+    gmock_includes=$withval
+  ])
+
+  AS_IF([test x$gmock_includes != x],
+        [GMOCK_CPPFLAGS=-I$gmock_includes],
+        [GMOCK_CPPFLAGS=])
   tmp_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS"
-
-  AC_CHECK_HEADER([gtest/gtest.h])
-
+  CPPFLAGS="$CPPFLAGS $GMOCK_CPPFLAGS"
+  AC_CHECK_HEADER([gmock/gmock.h],
+                  [have_gmock=yes],
+                  [have_gmock=no],
+                  [-])
   CPPFLAGS="$tmp_CPPFLAGS"
-
-  AC_LANG_POP
-
-  AS_IF([test -f $GTEST_SOURCE/src/gtest-all.cc && test -f $GTEST_SOURCE/src/gtest_main.cc],
-        [have_gtest_source=yes], [have_gtest_source=no])
-
-  AS_IF([test "x$ac_cv_header_gtest_gtest_h" = "xyes" && test "x$have_gtest_source" = "xyes"],
-        [have_gtest=yes] [AC_SUBST(GTEST_CPPFLAGS)] [AC_SUBST(GTEST_SOURCE)],
-        [have_gtest=no])
+  AS_IF([test x$have_gmock = xyes],[
+    AC_CHECK_FILES([$gmock_prefix/src/gmock-all.cc],
+                   [have_gmock=yes],
+                   [have_gmock=no])
+
+    gtest_include_path=/usr/include
+    gtest_prefix_path=/usr/src/gtest
+    AS_IF([test x$have_gmock = xyes],[
+      AC_SUBST([GMOCK_CPPFLAGS], "$GMOCK_CPPFLAGS -I$gmock_prefix")
+      AC_SUBST([GMOCK_PREFIX], [$gmock_prefix])
+      gtest_prefix_path="$GMOCK_PREFIX/gtest$PATH_SEPARATOR$gtest_prefix_path"
+      gtest_include_path="$GMOCK_PREFIX/gtest/include$PATH_SEPARATOR$gtest_include_path"
+    ])
+
+    AC_ARG_VAR([GTEST_PREFIX],
+               [Path to Google Test sources.])
+    AC_ARG_VAR([GTEST_CPPFLAGS],
+               [C preprocessor flags for Google Test.])
+
+    ax_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for incdir in $gtest_include_path; do
+      IFS=$ax_save_IFS
+      tmp_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS -I$incdir"
+      AC_CHECK_HEADER([gtest/gtest.h],
+                      [have_gtest=yes],
+                      [have_gtest=no])
+      CPPFLAGS="$tmp_CPPFLAGS"
+      AS_IF([test x$have_gtest = xyes],[
+        GTEST_CPPFLAGS=-I$incdir
+        break
+      ])
+    done
+    IFS=$ax_save_IFS
+
+    AS_IF([test x$have_gtest = xyes],[
+      ax_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+      for ax_prefix in $gtest_prefix_path; do
+        IFS=$ax_save_IFS
+        AC_CHECK_FILES([$ax_prefix/src/gtest-all.cc],
+                       [have_gtest=yes],
+                       [have_gtest=no])
+        AS_IF([test x$have_gtest = xyes],[
+          AC_SUBST([GTEST_CPPFLAGS], "$GTEST_CPPFLAGS -I$ax_prefix")
+          AC_SUBST([GTEST_PREFIX],[$ax_prefix])
+          break
+        ])
+      done
+      IFS=$ax_save_IFS
+    ])
+
+  ])
 ]) # CHECK_GTEST
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-07-03 22:22:41 +0000
+++ tests/Makefile.am	2013-07-10 11:59:28 +0000
@@ -1,9 +1,10 @@
 if BUILD_TESTS
 
-nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc
+nodist_libgtest_a_SOURCES = \
+ $(GMOCK_PREFIX)/src/gmock-all.cc \
+ $(GTEST_PREFIX)/src/gtest-all.cc
 
-libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) -w
-libgtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS)
+libgtest_a_CPPFLAGS = $(GMOCK_CPPFLAGS) $(GTEST_CPPFLAGS) -w
 check_LIBRARIES = libgtest.a
 
 check_PROGRAMS = \
@@ -54,6 +55,7 @@
   -DDATADIR=\""$(datadir)"\" \
   -DG_LOG_DOMAIN=\"NuxTests\" \
   -DTESTDIR=\""$(top_srcdir)/tests"\" \
+  $(GMOCK_CPPFLAGS) $(GTEST_CPPFLAGS) \
   $(GCC_TESTS_FLAGS) \
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
@@ -66,7 +68,7 @@
   libgtest.a
 
 gtest_nuxcore_LDFLAGS = \
-  -lpthread -lgmock \
+  -lpthread \
   -lboost_filesystem -lboost_system
 
 ##### gtest-nux ######
@@ -98,6 +100,7 @@
   -DDATADIR=\""$(datadir)"\" \
   -DG_LOG_DOMAIN=\"NuxTests\" \
   -DTESTDIR=\""$(top_srcdir)/tests"\" \
+  $(GMOCK_CPPFLAGS) $(GTEST_CPPFLAGS) \
   $(GCC_TESTS_FLAGS) \
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
@@ -114,7 +117,7 @@
   libgtest.a
 
 gtest_nux_LDFLAGS = \
-  -lpthread -lgmock \
+  -lpthread  \
   -lboost_filesystem -lboost_system
 
 ##### gtest-nux-slow ######
@@ -141,6 +144,7 @@
   -DDATADIR=\""$(datadir)"\" \
   -DG_LOG_DOMAIN=\"NuxTests\" \
   -DTESTDIR=\""$(top_srcdir)/tests"\" \
+  $(GMOCK_CPPFLAGS) $(GTEST_CPPFLAGS) \
   $(GCC_TESTS_FLAGS) \
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
@@ -157,7 +161,7 @@
   libgtest.a
 
 gtest_nux_slow_LDFLAGS = \
-  -lpthread -lgmock \
+  -lpthread  \
   -lboost_filesystem -lboost_system
 
 ##### gtest-nuxgraphics ######
@@ -175,6 +179,7 @@
   -DDATADIR=\""$(datadir)"\" \
   -DG_LOG_DOMAIN=\"NuxTests\" \
   -DTESTDIR=\""$(top_srcdir)/tests"\" \
+  $(GMOCK_CPPFLAGS) $(GTEST_CPPFLAGS) \
   $(GCC_TESTS_FLAGS) \
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
@@ -188,9 +193,6 @@
   $(NUX_LIBS) \
   libgtest.a
 
-gtest_nuxgraphics_LDFLAGS = \
-  -lgmock
-
 TestFlags = -I$(srcdir) \
   -I$(top_srcdir) \
   -DPREFIX=\""$(prefix)"\" \