bundle gtest with the sources to simplify building and running the tests

.gitignore

@@ -1,6 +1,8 @@
 .*
 *.a
+*.la
 *.o
+*.lo
 *.Po
 *.obj
 *.dvi
@@ -38,15 +40,21 @@ Makefile.in
 autom4te.*
 dvisvgm
 aclocal.*
+ar-lib
+compile
+libtool
+ltmain.sh
 missing
 cov-int
 lcov
 /config.*
 doc/buildman
 doc/dvisvgm.txt
-doc/dvisvgm.xml
+doc/dvisvgm*.xml
 doc/dvisvgm.html
 doc/dvisvgm.1
+m4/libtool.m4
+m4/lt*.m4
 doxy
 backup/*
 Win32
@@ -64,6 +72,8 @@ install-sh
 src/samples
 src/psdefs.psc
 src/CommandLine.*
+test-driver
+tests/hashcheck*
 tests/*Test
 svg2vml
 nbproject

.hgignore

@@ -1,6 +1,8 @@
 syntax: glob
 *.a
+*.la
 *.o
+*.lo
 *.Po
 *.obj
 *.dvi
@@ -34,10 +36,12 @@ missing
 ./config.*
 doc/buildman
 doc/dvisvgm.txt
-doc/dvisvgm.xml
+doc/dvisvgm*.xml
 doc/dvisvgm.html
 doc/dvisvgm.1
 doc/*.pdf
+m4/libtool.m4
+m4/lt*.m4
 doxy
 Debug
 Release
@@ -49,10 +53,16 @@ vc/zlib*
 vc/*.s*
 vc/_*
 vc/Upgrade*
+ar-lib
+compile
 configure
 depcomp
 install-sh
+libtool
+ltmain.sh
 src/CommandLine.*
+test-driver
+tests/hashcheck*
 tests/*Test
 nbproject
 stamp-h1

.travis.yml

@@ -9,9 +9,7 @@ compiler:
 
 before_install:
    - sudo apt-get update -qq
-   - sudo apt-get install -qq autotools-dev libkpathsea-dev libpotrace-dev libfreetype6-dev libgs-dev libz-dev texlive-base python-lxml libgtest-dev
-   # Ubuntu doesn't provide pre-built gtest libraries, so we have to build them here.
-   - "cd /usr/src/gtest/ && sudo cmake . && sudo cmake --build . && sudo mv libgtest* /usr/local/lib/ ; cd -"
+   - sudo apt-get install -qq autotools-dev libkpathsea-dev libpotrace-dev libfreetype6-dev libgs-dev libz-dev texlive-base python-lxml
 
 env:
    global:
@@ -31,6 +29,7 @@ addons:
       branch_pattern: coverity_scan
 
 script:
+   - uname -a
    - ./autogen.sh
    - ./configure
    - make

Makefile.am

@@ -6,6 +6,7 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = COPYING
 SUBDIRS = libs src tests doc
+ACLOCAL_AMFLAGS = -I m4
 
 if CODE_COVERAGE_ENABLED
 lcov_dir=$(top_builddir)/lcov

configure.ac

@@ -21,6 +21,8 @@ AC_PROG_CC
 AC_PROG_CC_C99
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX([11])
+AM_PROG_AR
+LT_INIT
 
 AC_PROG_RANLIB
 AC_LANG(C)

tests/create-makefile

@@ -13,6 +13,21 @@ cat >$out <<EOT
 
 SUBDIRS = data
 
+check_LTLIBRARIES = libgtest.la
+libgtest_la_SOURCES = gtest/src/gtest-all.cc gtest/src/gtest_main.cc
+libgtest_la_CPPFLAGS = -I\$(top_srcdir)/tests/gtest/include -I\$(top_srcdir)/tests/gtest
+libgtest_la_LDFLAGS = -pthread
+EXTRA_DIST = gtest/LICENSE \\
+	gtest/include \\
+	gtest/src/gtest.cc \\
+	gtest/src/gtest-death-test.cc \\
+	gtest/src/gtest-filepath.cc \\
+	gtest/src/gtest-internal-inl.h \\
+	gtest/src/gtest-port.cc \\
+	gtest/src/gtest-printers.cc \\
+	gtest/src/gtest-test-part.cc \\
+	gtest/src/gtest-typed-test.cc
+
 AM_CXXFLAGS = -I\$(top_srcdir)/src -Wall -DSRCDIR='"\$(srcdir)"' \$(CODE_COVERAGE_CFLAGS)
 
 TESTS = hashcheck
@@ -32,7 +47,8 @@ for f in *Test.cpp; do
 TESTS += $base
 check_PROGRAMS += $base
 ${base}_SOURCES = $f
-${base}_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -lpotrace -lfreetype -lgtest -lgtest_main -lpthread \$(CODE_COVERAGE_LDFLAGS)
+${base}_CPPFLAGS = -I\$(top_srcdir)/tests/gtest/include
+${base}_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype \$(CODE_COVERAGE_LDFLAGS)
 
 EOT
 done
@@ -45,7 +61,7 @@ done
 #done
 
 cat >>$out <<EOT
-EXTRA_DIST = check-conv genhashcheck.py normalize.xsl
+EXTRA_DIST += check-conv genhashcheck.py normalize.xsl
 TESTS += check-conv
 
 @CODE_COVERAGE_RULES@

tests/gtest/LICENSE

@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.