Skip to content

Commit

Permalink
Update googletest to 1.8.0
Browse files Browse the repository at this point in the history
Summary:
`make check` was failing because <gmock.h> is included but not supplied. Updating to googletest 1.8.0 includes both googletest & googlemock, so `make check` now runs (and passes).
Closes #547

Reviewed By: igorsugak

Differential Revision: D4593403

Pulled By: Orvid

fbshipit-source-id: 02f80e7b67e17562ff981e9c80a37f985eb685be
  • Loading branch information
tedjp authored and facebook-github-bot committed Feb 27, 2017
1 parent 5e77af4 commit 04574f4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
11 changes: 9 additions & 2 deletions README.md
Expand Up @@ -73,8 +73,15 @@ Folly is published on Github at https://github.com/facebook/folly
folly requires gcc 4.8+ and a version of boost compiled with C++11 support.

Please download googletest from
https://github.com/google/googletest/archive/release-1.7.0.zip and unzip it in the
folly/test subdirectory.
https://github.com/google/googletest/archive/release-1.8.0.tar.gz and unpack it into the
folly/test subdirectory as `gtest`:

(cd folly/test && \
rm -rf gtest && \
wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && \
tar zxf release-1.8.0.tar.gz && \
rm -f release-1.8.0.tar.gz && \
mv googletest-release-1.8.0 gtest)

#### Ubuntu 12.04

Expand Down
8 changes: 4 additions & 4 deletions folly/test/Makefile.am
Expand Up @@ -2,7 +2,7 @@ SUBDIRS = . function_benchmark

ACLOCAL_AMFLAGS = -I m4

CPPFLAGS += -Igtest-1.7.0/include
CPPFLAGS += -isystem gtest/googletest/include -isystem gtest/googlemock/include

TESTS= \
sorted_vector_types_test \
Expand All @@ -20,16 +20,16 @@ check_LTLIBRARIES = libfollytestmain.la libgtest.la
check_PROGRAMS =
noinst_LTLIBRARIES = thread_local_test_lib.la

libgtest_la_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src
libgtest_la_SOURCES = gtest-1.7.0/src/gtest-all.cc
libgtest_la_CPPFLAGS = -isystem gtest/googletest
libgtest_la_SOURCES = gtest/googletest/src/gtest-all.cc

if FOLLY_TESTMAIN
libfollytestmain_la_CPPFLAGS = $(AM_CPPFLAGS) $(libgtest_la_CPPFLAGS)
libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) common/TestMain.cpp
libfollytestmain_la_LIBADD = $(top_builddir)/init/libfollyinit.la $(top_builddir)/libfolly.la
else
libfollytestmain_la_CPPFLAGS = $(libgtest_la_CPPFLAGS)
libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest-1.7.0/src/gtest_main.cc
libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest/googletest/src/gtest_main.cc
libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la
endif

Expand Down

0 comments on commit 04574f4

Please sign in to comment.