test: Upgrade googlemock 1.7.0 to googletest 1.8.0

Note that with the release of 1.8.0, googlemock and googletest are unified into a single release.

test: Upgrade googlemock 1.7.0 to googletest 1.8.0
Note that with the release of 1.8.0, googlemock and googletest are unified into a single release.
5e24f358 · Roger Leigh · Jesse Beder · e2818c42 · 5e24f358 · 5e24f358
Commit 5e24f358 authored May 10, 2017 by Roger Leigh Committed by Jesse Beder Aug 24, 2017
20 changed files
--- a/test/gmock-1.7.0/include/gmock/gmock-more-matchers.h
+++ b/test/gmock-1.7.0/include/gmock/gmock-more-matchers.h
--- a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
+++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
--- a/test/gmock-1.7.0/include/gmock/gmock.h
+++ b/test/gmock-1.7.0/include/gmock/gmock.h
--- a/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ b/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
--- a/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
+++ b/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
--- a/test/gmock-1.7.0/src/gmock_main.cc
+++ b/test/gmock-1.7.0/src/gmock_main.cc
--- a/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h
+++ b/test/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-generated-internal-utils.h
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-generated-internal-utils.h
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-generated-internal-utils.h.pump
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-generated-internal-utils.h.pump
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-internal-utils.h
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-internal-utils.h
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-port.h
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-port.h
--- a/test/gmock-1.7.0/make/Makefile
+++ b/test/gmock-1.7.0/make/Makefile
--- a/test/gmock-1.7.0/msvc/2005/gmock.sln
+++ b/test/gmock-1.7.0/msvc/2005/gmock.sln
--- a/test/gmock-1.7.0/msvc/2005/gmock.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock.vcproj
--- a/test/gmock-1.7.0/msvc/2005/gmock_config.vsprops
+++ b/test/gmock-1.7.0/msvc/2005/gmock_config.vsprops
@@ -10,6 +10,6 @@
 	/>
 	<UserMacro
 		Name="GTestDir"
-		Value="../../gtest"
+		Value="../../../googletest"
 	/>
 </VisualStudioPropertySheet>
--- a/test/gmock-1.7.0/msvc/2005/gmock_main.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock_main.vcproj
--- a/test/gmock-1.7.0/msvc/2005/gmock_test.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock_test.vcproj
--- a/test/gmock-1.7.0/msvc/2010/gmock.sln
+++ b/test/gmock-1.7.0/msvc/2010/gmock.sln
--- a/test/gmock-1.7.0/msvc/2010/gmock.vcxproj
+++ b/test/gmock-1.7.0/msvc/2010/gmock.vcxproj
--- a/test/gtest-1.8.0/googlemock/msvc/2010/gmock_config.props
+++ b/test/gtest-1.8.0/googlemock/msvc/2010/gmock_config.props