Merge lp:~chasedouglas/grail/gtest-source into lp:grail

[Chase Douglas]

This change switches the xorg-gtest build framework from a library linking mechanism to a local building mechanism. This is required due to upstream changes to gtest and xorg-gtest, where precompiled libraries are discouraged.

In order to test this, update xutils-dev to version 1:7.7~1 and libxorg-gtest-dev to version 2.0.0-0ubuntu1.

[lp:~chasedouglas/grail/gtest-source]

206. By Chase Douglas on 2012-03-20

Merged fix-visibility into gtest-source.

[Stephen M. Webb (bregma)]

This does not not build for me as-is. In src/Makefile.am, the libraries listed in LIBADD are not linked in because LIBADD is not a standard variable picked up automatcally by libtool. The symptom is that later tests fail with missing evemu_ symbol errors.

To get the library to build properly I added the line

libutouch_grail_la_LIBADD = $(LIBADD)

review: Needs Fixing

[lp:~chasedouglas/grail/gtest-source]

207. By Chase Douglas on 2012-03-20

Merged fix-visibility into gtest-source.

[Chase Douglas (chasedouglas)]

This was a bug in the previous am-flags pipe. Since I hadn't merged it yet, I fixed it in that pipe and pumped it through to here.

I double checked that grail builds from source by cleaning my tree of all ignored files and building from scratch.

review: Needs Resubmitting

[Stephen M. Webb (bregma)]

Works nicely now. Pass.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-03-09 13:23:57 +0000
+++ .bzrignore	2012-03-20 20:48:21 +0000
@@ -18,6 +18,9 @@
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+m4/pkg.m4
+m4/xorg-gtest.m4
+m4/xorg-macros.m4
 Makefile
 Makefile.in
 stamp-h1

=== modified file 'Makefile.am'
--- Makefile.am	2012-02-15 16:31:09 +0000
+++ Makefile.am	2012-03-20 20:48:21 +0000
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 --install
+
 SUBDIRS = src test tools
 
 pkgconfigdir = $(libdir)/pkgconfig

=== modified file 'configure.ac'
--- configure.ac	2012-03-20 20:48:21 +0000
+++ configure.ac	2012-03-20 20:48:21 +0000
@@ -9,9 +9,6 @@
 AC_CONFIG_AUX_DIR([config-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
-m4_include([m4/gcov.m4])
-m4_include([m4/gtest.m4])
-
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_SILENT_RULES([yes])
@@ -41,16 +38,10 @@
 ])
 
 # Check for TDD tools
-AC_CHECK_GTEST
-
-AS_IF([test "x$have_gtest" = xyes],
-    [PKG_CHECK_MODULES(XORG_GTEST, xorg-gtest,
-        [have_xorg_gtest="yes"],
-        [AC_MSG_WARN([xorg-gtest not installed, tests will not be built])])],
-    [AC_MSG_WARN([gtest not installed, tests will not be build])]
-)
-
-AM_CONDITIONAL([HAVE_GTEST], [test "x$have_xorg_gtest" = xyes])	
+CHECK_XORG_GTEST([AC_MSG_NOTICE([xorg-gtest is available, tests will be built])],
+                 [AC_MSG_WARN([xorg-gtest is not available, tests will not be built])])
+
+AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS], [test "x$have_xorg_gtest" = xyes])
                  
 AC_SUBST([GTEST_LDFLAGS])	
 AC_SUBST([GTEST_CXXFLAGS])

=== removed file 'm4/gtest.m4'
--- m4/gtest.m4	2012-03-20 20:48:21 +0000
+++ m4/gtest.m4	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Checks whether the gtest library is available on the system
-# Allows for adjusting the include and library path.
-# Sets have_gtest=yes if the library is present and
-# reports the compiler and linker flags in 
-# GTEST_CXXFLAGS AND GTEST_LDFLAGS, respectively.
-AC_DEFUN([AC_CHECK_GTEST],
-[
-  AC_ARG_WITH([gtest-include-path],
-  [AS_HELP_STRING([--with-gtest-include-path],
-    [location of the Google test headers, defaults to /usr/include])],
-  [GTEST_CXXFLAGS="-I$withval"],
-  [GTEST_CXXFLAGS='-I/usr/include'])
-
-  AC_ARG_WITH([gtest-lib-path],
-  [AS_HELP_STRING([--with-gtest-lib-path], [location of the Google test libraries])],
-  [GTEST_LDFLAGS="-L$withval -lpthread"],
-  [GTEST_LDFLAGS='-lgtest -lpthread'])
-
-  AC_HAVE_LIBRARY( [gtest], 
-                [have_gtest=yes], 
-                 AC_MSG_WARN([package 'gtest' not found: tests disabled]))
-
-  AC_SUBST(GTEST_CXXFLAGS)
-  AC_SUBST(GTEST_LDFLAGS)
-
-]) # AC_CHECK_GTEST
-

=== added file 'test/Makefile-xorg-gtest.am'
--- test/Makefile-xorg-gtest.am	1970-01-01 00:00:00 +0000
+++ test/Makefile-xorg-gtest.am	2012-03-20 20:48:21 +0000
@@ -0,0 +1,61 @@
+# Copyright (C) 2012 Canonical, Ltd.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+XORG_GTEST_BUILD_LIBS = \
+	libgtest.a \
+	libgtest_main.a \
+	libxorg-gtest.a \
+	libxorg-gtest_main.a
+
+nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc
+libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) $(AM_CPPFLAGS) -w
+libgtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS)
+
+nodist_libgtest_main_a_SOURCES = $(GTEST_SOURCE)/src/gtest_main.cc
+libgtest_main_a_CPPFLAGS = $(GTEST_CPPFLAGS) $(AM_CPPFLAGS) -w
+libgtest_main_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS)
+
+nodist_libxorg_gtest_a_SOURCES = $(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp
+libxorg_gtest_a_CPPFLAGS = \
+	$(XORG_GTEST_CPPFLAGS) \
+	$(GTEST_CPPFLAGS) \
+	$(AM_CPPFLAGS) \
+	-w
+libxorg_gtest_a_CXXFLAGS = \
+	$(XORG_GTEST_CXXFLAGS) \
+	$(GTEST_CXXFLAGS) \
+	$(AM_CPPFLAGS)
+
+nodist_libxorg_gtest_main_a_SOURCES = \
+	$(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp
+libxorg_gtest_main_a_CPPFLAGS = \
+	$(XORG_GTEST_CPPFLAGS) \
+	$(GTEST_CPPFLAGS) \
+	$(AM_CPPFLAGS) \
+	-w
+libxorg_gtest_main_a_CXXFLAGS = \
+	$(XORG_GTEST_CXXFLAGS) \
+	$(GTEST_CXXFLAGS) \
+	$(AM_CXXFLAGS)
+
+XORG_GTEST_LIBS = libxorg-gtest.a libgtest.a -lpthread $(X11_LIBS)
+XORG_GTEST_MAIN_LIBS = libxorg-gtest_main.a

=== modified file 'test/Makefile.am'
--- test/Makefile.am	2012-03-20 20:48:21 +0000
+++ test/Makefile.am	2012-03-20 20:48:21 +0000
@@ -1,6 +1,9 @@
 test_targets = test-c-compile test-cxx-compile
 
-if HAVE_GTEST
+if ENABLE_INTEGRATION_TESTS
+include $(top_srcdir)/test/Makefile-xorg-gtest.am
+check_LIBRARIES = $(XORG_GTEST_BUILD_LIBS)
+
 test_targets += check-grail
 endif
 
@@ -47,7 +50,8 @@
 	-I$(top_srcdir)/include \
 	-I../include \
 	$(WARNING_CPPFLAGS) \
-	$(GTEST_CPPFLAGS)
+	$(GTEST_CPPFLAGS) \
+	$(XORG_GTEST_CPPFLAGS)
 
 AM_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
@@ -57,7 +61,7 @@
 	$(CXX11_CXXFLAGS) \
 	$(COVERAGE_CXXFLAGS) \
 	$(GTEST_CXXFLAGS) \
-	$(XORG_GTEST_CFLAGS) \
+	$(XORG_GTEST_CXXFLAGS) \
 	$(FRAME_CFLAGS)
 
 #
@@ -66,11 +70,12 @@
 #
 check_grail_LDADD = \
 	$(top_builddir)/src/.libs/libutouch-grail.a \
-	$(EVEMU_LIBS) $(FRAME_LIBS) $(MTDEV_LIBS) $(COVERAGE_LIBS)
-
-if HAVE_GTEST
-check_grail_LDADD += $(GTEST_LDFLAGS) -lxorg-gtest_main $(XORG_GTEST_LIBS)
-endif
+	$(EVEMU_LIBS) \
+	$(FRAME_LIBS) \
+	$(MTDEV_LIBS) \
+	$(COVERAGE_LIBS) \
+	$(XORG_GTEST_LIBS) \
+	$(XORG_GTEST_MAIN_LIBS)
 
 if HAVE_XI
 check_grail_LDADD += \