Chromium Code Reviews

Issue 2847693002: V8: Roll googletest to 1.8.0.

Created:
3 years, 7 months ago by pwnall
Modified:
3 years, 7 months ago
Reviewers:
Franzi, dpranke, adamk, Michael Achenbach
CC:
v8-reviews_googlegroups.com
Target Ref:
refs/heads/master
Project:
v8
Visibility:
Public.

Description

Roll googletest to 1.8.0. This is the V8 equivalent to http://crrev.com/2779193002 and must be landed before //build/secondary/{gtest,gmock} are removed from Chromium. GoogleTest (gtest) and GoogleMock (gmock) are now hosted into the same googletest repository. In order to cope with this, the googletest repository is now sourced at third_party/googletest. The file/directory layout of Google Test is not yet considered stable. To minimize disruption while Google Test stabilizes, Chromium code will be insulated from third_party/googletest. * testing/gtest/include/gtest/ and testing/gmock/include/gmock have been populated with headers that forward into the appropriate locations of third_party/googletest * testing/BUILD.gn has been populated with the targets //testing/gtest(:gtest_main) and //testing/gmock(:gmock_main), which depend on the appropriate //third_party/googletest targets. All Chromium code should keep depending on the targets and headers in testing/{gtest,gmock} for now. BUG=chromium:630705

Patch Set 1 : Fixed GN build on Mac. #

Patch Set 2 : Fix for Mac build error. #

Total comments: 2

Patch Set 3 : Rebased + updated with landed version of Chromium-side CL. #

Patch Set 4 : Incorporated http://crrev.com/2849783003 #

Total comments: 1
Unified diffs Side-by-side diffs Stats (+605 lines, -170 lines)
M .gitignore View 1 chunk +2 lines, -2 lines 0 comments
M DEPS View 2 chunks +2 lines, -4 lines 0 comments
A testing/DEPS View 1 chunk +3 lines, -0 lines 0 comments
M testing/gmock.gyp View 2 chunks +2 lines, -38 lines 0 comments
A testing/gmock/BUILD.gn View 1 chunk +34 lines, -0 lines 0 comments
A testing/gmock/OWNERS View 1 chunk +2 lines, -0 lines 0 comments
A testing/gmock/include/gmock/gmock.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gmock/include/gmock/gmock-actions.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gmock/include/gmock/gmock-generated-function-mockers.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gmock/include/gmock/gmock-matchers.h View 1 chunk +10 lines, -0 lines 0 comments
D testing/gmock_custom/gmock/internal/custom/gmock-port.h View 1 chunk +0 lines, -29 lines 0 comments
M testing/gtest.gyp View 2 chunks +9 lines, -68 lines 0 comments
A testing/gtest/BUILD.gn View 1 chunk +85 lines, -0 lines 0 comments
A testing/gtest/OWNERS View 1 chunk +2 lines, -0 lines 0 comments
A testing/gtest/empty.cc View 1 chunk +3 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest-death-test.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest-message.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest-param-test.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest-spi.h View 1 chunk +10 lines, -0 lines 0 comments
A testing/gtest/include/gtest/gtest_prod.h View 1 chunk +10 lines, -0 lines 1 comment
A third_party/googletest/BUILD.gn View 1 chunk +150 lines, -0 lines 0 comments
A third_party/googletest/OWNERS View 1 chunk +4 lines, -0 lines 0 comments
A third_party/googletest/README.chromium View 1 chunk +17 lines, -0 lines 0 comments
A + third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h View 2 chunks +4 lines, -8 lines 0 comments
A third_party/googletest/googlemock.gyp View 1 chunk +71 lines, -0 lines 0 comments
A third_party/googletest/googletest.gyp View 1 chunk +87 lines, -0 lines 0 comments
M tools/release/test_update_node.py View 4 chunks +17 lines, -9 lines 0 comments
M tools/release/testdata/v8/.gitignore View 1 chunk +1 line, -2 lines 0 comments
D tools/release/testdata/v8/testing/gtest/baz/gtest_foo View 1 chunk +0 lines, -1 line 0 comments
D tools/release/testdata/v8/testing/gtest/baz/gtest_new View 1 chunk +0 lines, -1 line 0 comments
D tools/release/testdata/v8/testing/gtest/gtest_bar View 1 chunk +0 lines, -1 line 0 comments
D tools/release/testdata/v8/testing/gtest/gtest_new View 1 chunk +0 lines, -1 line 0 comments
D tools/release/testdata/v8/testing/gtest/new/gtest_new View 1 chunk +0 lines, -1 line 0 comments
A tools/release/testdata/v8/third_party/googletest/src/googletest/include/gtest/baz/gtest_new View 0 chunks +-1 lines, --1 lines 0 comments
A tools/release/testdata/v8/third_party/googletest/src/googletest/include/gtest/gtest_new View 0 chunks +-1 lines, --1 lines 0 comments
A tools/release/testdata/v8/third_party/googletest/src/googletest/include/gtest/gtest_prod.h View 1 chunk +1 line, -0 lines 0 comments
A tools/release/testdata/v8/third_party/googletest/src/googletest/include/gtest/new/gtest_new View 0 chunks +-1 lines, --1 lines 0 comments
M tools/release/update_node.py View 1 chunk +12 lines, -8 lines 0 comments

Messages

Total messages: 50 (41 generated)
pwnall
adamk: Can you please take a look? dpranke: Can you please check my GYP files? ...
3 years, 7 months ago (2017-04-27 10:32:14 UTC) #18
adamk
machenbach@ is a better reviewer for build system changes like this one
3 years, 7 months ago (2017-04-27 17:18:20 UTC) #20
Michael Achenbach
Mostly lg. Can't say much about many of the new files, I assume they are ...
3 years, 7 months ago (2017-04-28 08:19:39 UTC) #26
Yang
On 2017/04/28 08:19:39, Michael Achenbach wrote: > Mostly lg. Can't say much about many of ...
3 years, 7 months ago (2017-04-28 08:55:33 UTC) #27
Yang
On 2017/04/28 08:55:33, Yang wrote: > On 2017/04/28 08:19:39, Michael Achenbach wrote: > > Mostly ...
3 years, 7 months ago (2017-04-28 09:04:39 UTC) #28
Michael Achenbach
> Turns out this CL does not apply unless you manually delete testing/mock and > ...
3 years, 7 months ago (2017-04-28 09:07:39 UTC) #29
Yang
On 2017/04/28 09:04:39, Yang wrote: > On 2017/04/28 08:55:33, Yang wrote: > > On 2017/04/28 ...
3 years, 7 months ago (2017-04-28 10:58:23 UTC) #34
pwnall
On 2017/04/28 10:58:23, Yang wrote: > On 2017/04/28 09:04:39, Yang wrote: > > On 2017/04/28 ...
3 years, 7 months ago (2017-05-03 10:48:00 UTC) #49
Michael Achenbach
3 years, 7 months ago (2017-05-03 12:57:12 UTC) #50
I wasn't able to apply the patch locally. Maybe needs a rebase? I tried on
current ToT:
git cl patch --rietveld 2847693002

I'd check how to fix presubmit. In general it should be just running this tool:
tools/verify_source_deps.py

And then change the whitelist/blacklist/paths in the tool to make it shut up...

https://codereview.chromium.org/2847693002/diff/140001/testing/gtest/include/...
File testing/gtest/include/gtest/gtest_prod.h (right):

https://codereview.chromium.org/2847693002/diff/140001/testing/gtest/include/...
testing/gtest/include/gtest/gtest_prod.h:10: #include
"third_party/googletest/src/googletest/include/gtest/gtest_prod.h"
Where is this file? Not seeing it here:
https://chromium.googlesource.com/external/github.com/google/googletest/+/mas...

This is currently making the gcmole fail.

Powered by Google App Engine