Pull google/googletest@82b11b8

As a preparation of the migration to Visual Studio 2015 Update 1, this CL updates src/third_party/gtest as follows: from: google/googletest@1d53731 to: google/googletest@82b11b8 Updating gtest also helps us to reduce the number of git submodules because google/googlemock was merged into google/googletest in google/googletest@1f87a09. Hence we do not need to check out src/third_party/gmock anymore. No behavior change is intended in production binaries. BUG=#315 TEST=unittest REF_BUG= REF_CL=111825865,112890964
google · Jan 24, 2016 · d76bf78 · d76bf78
1 parent 91d5868
commit d76bf78
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "src/third_party/fontTools"]
 	path = src/third_party/fontTools
 	url = https://github.com/googlei18n/fonttools.git
-[submodule "src/third_party/gmock"]
-	path = src/third_party/gmock
-	url = https://github.com/google/googlemock.git
 [submodule "src/third_party/gtest"]
 	path = src/third_party/gtest
 	url = https://github.com/google/googletest.git

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2318
+BUILD=2319
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/testing/testing.gyp b/src/testing/testing.gyp
@@ -59,6 +59,8 @@
           'GTEST_LANG_CXX11=1',
           'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
         ],
+        'gtest_dir': '<(third_party_dir)/gtest/googletest',
+        'gmock_dir': '<(third_party_dir)/gtest/googlemock',
         'conditions': [
           ['_toolset=="target" and target_platform=="Android"', {
             'gtest_defines': [
@@ -74,24 +76,24 @@
         ],
       },
       'sources': [
-        '<(DEPTH)/third_party/gmock/src/gmock-cardinalities.cc',
-        '<(DEPTH)/third_party/gmock/src/gmock-internal-utils.cc',
-        '<(DEPTH)/third_party/gmock/src/gmock-matchers.cc',
-        '<(DEPTH)/third_party/gmock/src/gmock-spec-builders.cc',
-        '<(DEPTH)/third_party/gmock/src/gmock.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-death-test.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-filepath.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-port.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-printers.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-test-part.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest-typed-test.cc',
-        '<(DEPTH)/third_party/gtest/src/gtest.cc',
+        '<(gmock_dir)/src/gmock-cardinalities.cc',
+        '<(gmock_dir)/src/gmock-internal-utils.cc',
+        '<(gmock_dir)/src/gmock-matchers.cc',
+        '<(gmock_dir)/src/gmock-spec-builders.cc',
+        '<(gmock_dir)/src/gmock.cc',
+        '<(gtest_dir)/src/gtest-death-test.cc',
+        '<(gtest_dir)/src/gtest-filepath.cc',
+        '<(gtest_dir)/src/gtest-port.cc',
+        '<(gtest_dir)/src/gtest-printers.cc',
+        '<(gtest_dir)/src/gtest-test-part.cc',
+        '<(gtest_dir)/src/gtest-typed-test.cc',
+        '<(gtest_dir)/src/gtest.cc',
       ],
       'include_dirs': [
-        '<(DEPTH)/third_party/gmock',
-        '<(DEPTH)/third_party/gmock/include',
-        '<(DEPTH)/third_party/gtest',
-        '<(DEPTH)/third_party/gtest/include',
+        '<(gmock_dir)',
+        '<(gmock_dir)/include',
+        '<(gtest_dir)',
+        '<(gtest_dir)/include',
       ],
       'defines': [
         '<@(gtest_defines)',
@@ -101,8 +103,8 @@
           '<@(gtest_defines)',
         ],
         'include_dirs': [
-          '<(third_party_dir)/gmock/include',
-          '<(third_party_dir)/gtest/include',
+          '<(gmock_dir)/include',
+          '<(gtest_dir)/include',
         ],
       },
       'conditions': [

diff --git a/src/third_party/gmock b/src/third_party/gmock
diff --git a/src/third_party/gtest b/src/third_party/gtest