Permalink
Browse files

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
  • Loading branch information...
1 parent 91d5868 commit d76bf787c778b09d645606e9c006c2b2fc401f88 @yukawa yukawa committed Jan 24, 2016
Showing with 22 additions and 24 deletions.
  1. +0 −3 .gitmodules
  2. +1 −1 src/mozc_version_template.txt
  3. +20 −18 src/testing/testing.gyp
  4. +0 −1 src/third_party/gmock
  5. +1 −1 src/third_party/gtest
View
@@ -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
@@ -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.
@@ -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': [
Submodule gmock deleted from d478a1
Submodule gtest updated 317 files

0 comments on commit d76bf78

Please sign in to comment.