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

Issue 2856383002: Roll googletest to 1.7.0+. (Closed)

Created:
3 years, 7 months ago by pwnall
Modified:
3 years, 7 months ago
Reviewers:
rkc, Dirk Pranke, Nico
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.7.0+. This is a (less ambitious) re-land of http://crrev.com/2852613002 which was reverted due to content_browsertests crashes on ChromeOS. That CL is a re-land of http://crrev.com/2779193002 which was reverted due to build errors on Mac. Instead of rolling Google Test to 1.8.0, this CL uses the last commit before a breaking change was introduced. Details about the breakage are in https://crbug.com/630705#c27 and https://crbug.com/630705#c28. It is expected that rolling Google Test from there to the next usable version will be much less disruptive. 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=out/Default/content_browsertests --gtest_filter=MojoTest.Init TESTED=ninja -C out/Default/ ced_unittests && ninja -C out/Default TBR=rkc, dpranke Review-Url: https://codereview.chromium.org/2856383002 Cr-Commit-Position: refs/heads/master@{#469551} Committed: https://chromium.googlesource.com/chromium/src/+/52e27a3d242ac0bbcbdc00683f6489ed4d8e9b3f

Patch Set 1 : http://crrev.com/2852613002 #

Patch Set 2 : Remove Windows clang warning section, because gtest was fixed. #

Patch Set 3 : Revert to the old gtest+gmock, but with the new directory structure. #

Patch Set 4 : Roll to 1.8.0 release commit. #

Patch Set 5 : Roll back to first googletest commit with the new gtest gmock structure. #

Patch Set 6 : First bad gtest commit - bb5c92f9d1f0b26c79978e92f38a0e5fbcc8c9bf #

Patch Set 7 : Last good gtest commit - 43359642a1c16ad3f4fc575c7edd0cb935810815 #

Patch Set 8 : Revert net/ test change, it will be needed when we roll to 1.8.0+ #

Patch Set 9 : Correct googletest version in README.chromium. #

Patch Set 10 : (failed) Rebase to get past http://crrev.com/2789433004 #

Patch Set 11 : Rebase to get past http://crrev.com/2789433004 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+424 lines, -48 lines) Patch
M .gitignore View 1 chunk +0 lines, -2 lines 0 comments Download
M DEPS View 1 2 3 4 5 6 7 8 9 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 2 3 4 5 6 7 8 9 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
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 3 4 5 6 7 8 9 10 1 chunk +97 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 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 1 chunk +136 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 2 3 4 5 6 7 8 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: 45 (37 generated)
pwnall
thakis@: PTAL?
3 years, 7 months ago (2017-05-04 16:42:25 UTC) #22
Nico
Lgtm, but please say "reland, but roll to earlier revision" in cl description
3 years, 7 months ago (2017-05-04 16:52:11 UTC) #26
pwnall
On 2017/05/04 16:52:11, Nico wrote: > Lgtm, but please say "reland, but roll to earlier ...
3 years, 7 months ago (2017-05-04 17:57:52 UTC) #28
Nico
lgtm++
3 years, 7 months ago (2017-05-04 17:58:49 UTC) #29
Dirk Pranke
rs- lgtm (deferring to thakis, really).
3 years, 7 months ago (2017-05-04 22:29:24 UTC) #36
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/2856383002/200001
3 years, 7 months ago (2017-05-05 00:39:24 UTC) #41
pwnall
On 2017/05/04 22:29:24, Dirk Pranke (slow until May 4) wrote: > rs- lgtm (deferring to ...
3 years, 7 months ago (2017-05-05 00:39:39 UTC) #42
commit-bot: I haz the power
3 years, 7 months ago (2017-05-05 00:44:57 UTC) #45
Message was sent while issue was closed.
Committed patchset #11 (id:200001) as
https://chromium.googlesource.com/chromium/src/+/52e27a3d242ac0bbcbdc00683f64...

Powered by Google App Engine
This is Rietveld 408576698