Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Issue 2852613002: Roll googletest to 1.8.0. (Closed)

Created:
3 years, 7 months ago by pwnall
Modified:
3 years, 7 months ago
Reviewers:
rkc, Dirk Pranke, Nico, agl, msramek
CC:
chromium-reviews, cbentzel+watch_chromium.org, vmpstr+watch_chromium.org, net-reviews_chromium.org, scheib+watch_chromium.org, ortuno+watch_chromium.org, mac-reviews_chromium.org, danakj+watch_chromium.org
Target Ref:
refs/heads/master
Project:
chromium
Visibility:
Public.

Description

Roll googletest to 1.8.0. This is a re-land of http://crrev.com/2779193002 which was reverted due to build errors on Mac. 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=630705 TESTED=ninja -C out/Default/ ced_unittests && ninja -C out/Default TBR=rkc,dpranke,agl Review-Url: https://codereview.chromium.org/2852613002 Cr-Commit-Position: refs/heads/master@{#468860} Committed: https://chromium.googlesource.com/chromium/src/+/dbcef9bdc1edd32d62c6de0bd382cdc78ce385da

Patch Set 1 : https://codereview.chromium.org/2779193002/ #

Patch Set 2 : Attempt to fix the Mac build error. #

Patch Set 3 : Less elegant fix that should cover all cases. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+428 lines, -50 lines) Patch
M .gitignore View 1 chunk +0 lines, -2 lines 0 comments Download
M DEPS View 2 chunks +3 lines, -6 lines 0 comments Download
M base/gtest_prod_util.h View 1 chunk +1 line, -1 line 0 comments Download
M build/secondary/testing/gmock/BUILD.gn View 1 chunk +7 lines, -0 lines 0 comments Download
M build/secondary/testing/gtest/BUILD.gn View 1 chunk +7 lines, -0 lines 0 comments Download
M device/bluetooth/dbus/fake_bluetooth_media_endpoint_service_provider.h View 1 chunk +1 line, -1 line 0 comments Download
M net/socket/sequenced_socket_data_unittest.cc View 1 chunk +2 lines, -2 lines 0 comments Download
A testing/gmock/BUILD.gn View 1 chunk +34 lines, -0 lines 0 comments Download
A testing/gmock/OWNERS View 1 chunk +2 lines, -0 lines 0 comments Download
A testing/gmock/include/gmock/gmock.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gmock/include/gmock/gmock-actions.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gmock/include/gmock/gmock-generated-function-mockers.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gmock/include/gmock/gmock-matchers.h View 1 chunk +10 lines, -0 lines 0 comments Download
D testing/gmock_custom/gmock/internal/custom/gmock-port.h View 1 chunk +0 lines, -27 lines 0 comments Download
A testing/gtest/BUILD.gn View 1 2 1 chunk +85 lines, -0 lines 0 comments Download
A testing/gtest/OWNERS View 1 chunk +2 lines, -0 lines 0 comments Download
A testing/gtest/empty.cc View 1 2 1 chunk +3 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest-death-test.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest-message.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest-param-test.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest-spi.h View 1 chunk +10 lines, -0 lines 0 comments Download
A testing/gtest/include/gtest/gtest_prod.h View 1 chunk +10 lines, -0 lines 0 comments Download
M testing/gtest_mac.h View 1 chunk +2 lines, -2 lines 0 comments Download
M testing/gtest_mac.mm View 1 chunk +3 lines, -3 lines 0 comments Download
M testing/gtest_mac_unittest.mm View 1 chunk +1 line, -1 line 0 comments Download
M third_party/.gitignore View 1 chunk +1 line, -0 lines 0 comments Download
A third_party/googletest/BUILD.gn View 1 chunk +150 lines, -0 lines 0 comments Download
A third_party/googletest/OWNERS View 1 chunk +4 lines, -0 lines 0 comments Download
A third_party/googletest/README.chromium View 1 chunk +17 lines, -0 lines 0 comments Download
A + third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h View 1 chunk +3 lines, -5 lines 0 comments Download

Messages

Total messages: 34 (17 generated)
pwnall
dpranke: Can you PTAL and see if the fix for the build error makes sense? ...
3 years, 7 months ago (2017-04-28 13:38:58 UTC) #11
Nico
lgtm
3 years, 7 months ago (2017-05-02 20:39:44 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2852613002/40001
3 years, 7 months ago (2017-05-02 22:28:55 UTC) #17
pwnall
On 2017/05/02 20:39:44, Nico wrote: > lgtm Thank you very much! I'll monitor the bots ...
3 years, 7 months ago (2017-05-02 22:29:44 UTC) #18
commit-bot: I haz the power
Committed patchset #3 (id:40001) as https://chromium.googlesource.com/chromium/src/+/dbcef9bdc1edd32d62c6de0bd382cdc78ce385da
3 years, 7 months ago (2017-05-03 01:50:46 UTC) #21
Michael Achenbach
This is suboptimal as it now blocks rolling build into V8: https://chromium-review.googlesource.com/c/493947/ Wouldn't it be ...
3 years, 7 months ago (2017-05-03 09:18:01 UTC) #22
Michael Achenbach
On 2017/05/03 09:18:01, Michael Achenbach wrote: > This is suboptimal as it now blocks rolling ...
3 years, 7 months ago (2017-05-03 09:20:01 UTC) #23
pwnall
On 2017/05/03 09:20:01, Michael Achenbach wrote: > On 2017/05/03 09:18:01, Michael Achenbach wrote: > > ...
3 years, 7 months ago (2017-05-03 09:22:35 UTC) #24
Nico
Also see the somewhat lengthy discussion about v8 in the original version of this cl. ...
3 years, 7 months ago (2017-05-03 10:06:08 UTC) #25
msramek
This seems to have broken *all* content_browsertests on the ChromiumOS bot. Stack trace: Received signal ...
3 years, 7 months ago (2017-05-03 10:51:03 UTC) #27
msramek
A revert of this CL (patchset #3 id:40001) has been created in https://codereview.chromium.org/2856963003/ by msramek@chromium.org. ...
3 years, 7 months ago (2017-05-03 10:54:30 UTC) #28
Nico
Please file a bug for the chromeos thi On May 3, 2017 6:54 AM, <msramek@chromium.org> ...
3 years, 7 months ago (2017-05-03 11:02:14 UTC) #29
pwnall
On 2017/05/03 10:54:30, msramek (recovering) wrote: > A revert of this CL (patchset #3 id:40001) ...
3 years, 7 months ago (2017-05-03 21:56:05 UTC) #30
Nico
There's no bug I believe (I asked for one on the revert CL too), but ...
3 years, 7 months ago (2017-05-03 22:02:57 UTC) #31
pwnall
On 2017/05/03 22:02:57, Nico wrote: > There's no bug I believe (I asked for one ...
3 years, 7 months ago (2017-05-03 22:46:53 UTC) #32
Nico
The buildbot urls expire, but you can hit "logdog" in the upper right to get ...
3 years, 7 months ago (2017-05-03 22:52:17 UTC) #33
pwnall
3 years, 7 months ago (2017-05-04 00:51:29 UTC) #34
Message was sent while issue was closed.
On 2017/05/03 22:52:17, Nico wrote:
> The buildbot urls expire, but you can hit "logdog" in the upper right to
> get to
>
https://luci-milo.appspot.com/buildbot/chromium.chromiumos/Linux%20ChromiumOS...
> and that won't expire.

Thanks for explaining! I might be lazy then.
 
> Do you think another attempt will take multiple weeks? I asked someone on a
> different review who was touching gtest/BUILD.gn to wait until this here is
> in for good. If you think it'll take a while, I'll tell them to land first
> (it's fairly easy to merge into this).

I'll try to have another attempt ready in a day or so, to keep the momentum
going. I want to take advantage of the fact that this CL's state is in our
heads.

If the other CL is ready to go today/tomorrow, I'm OK with rebasing.

Powered by Google App Engine
This is Rietveld 408576698