New issue
Advanced search Search tips

Issue 813219 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Mar 2018
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug

Blocking:
issue 801780



Sign in to add a comment

Roll Google Test

Project Member Reported by pwnall@chromium.org, Feb 16 2018

Issue description

This tracks rolling Google Test.

A roll was attempted in https://crrev.com/c/900544 but was reverted
because it broke net_unittests on Windows Debug builds https://crbug.com/810347.

A fix was prepared in https://github.com/google/googletest/pull/1450 and merged. However, in the meantime, Google Test has received significant changes that break our tests. Fixing will not be trivial, so I'm setting up a tracking bug.
 

Comment 1 by pwnall@chromium.org, Feb 16 2018

Components: Internals
Project Member

Comment 2 by bugdroid1@chromium.org, Feb 16 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9d7cd643002e51adf7fa55e8051c1867f76be5ce

commit 9d7cd643002e51adf7fa55e8051c1867f76be5ce
Author: Victor Costan <pwnall@chromium.org>
Date: Fri Feb 16 23:02:47 2018

Fix warnings exposed by googletest update.

These patches are taken out of googletest update
https://crrev.com/c/900544. That CL has been reverted, and fixing the
revert cause may take a while. Landing these patches now, separately,
will reduce the size of the next googletest update CL, and might reduce
code churn, if the googletest update CL needs to be reverted.

Bug:  813219 
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I19022e107f459e1dce91921336346c610ec51409
Reviewed-on: https://chromium-review.googlesource.com/924444
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537444}
[modify] https://crrev.com/9d7cd643002e51adf7fa55e8051c1867f76be5ce/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
[modify] https://crrev.com/9d7cd643002e51adf7fa55e8051c1867f76be5ce/third_party/WebKit/Source/core/html/parser/HTMLParserIdiomsTest.cpp

Project Member

Comment 3 by bugdroid1@chromium.org, Feb 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b289091fd7db8690ed830b8e076fe60e1d9b9f0f

commit b289091fd7db8690ed830b8e076fe60e1d9b9f0f
Author: Victor Costan <pwnall@chromium.org>
Date: Tue Feb 20 18:57:20 2018

Roll src/third_party/googletest/src/ 0062e4869..7a2563a51 (65 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/0062e4869f07..7a2563a51456

This is a less ambitions reland of https://crrev.com/c/900544 which was
reverted because it broke net_unittests on Windows Debug builds
https://crbug.com/810347. A full roll is blocked on solving a complex
issue documented in the attached bug. In the meantime, this roll reduces
the gap between Chrome and upstream.

$ git log 0062e4869..7a2563a51 --date=short --no-merges --format='%ad %ae %s'
2018-01-24 misterg revert, lets get this compiled
2018-01-23 misterg Many code merge/upstream changes
2018-01-23 misterg Merging, upstream http://cl/182836545
2018-01-22 misterg more code merge
2018-01-22 misterg merges, cl/155419551 and other
2018-01-22 misterg more merging
2018-01-22 misterg merging
2018-01-22 misterg code merge
2018-01-18 misterg Adding python tests to Bazel build file.
2018-01-18 ftrushkin Use fully qualified  in examples
2018-01-18 ftrushkin Document ScopedTrace utility
2018-01-11 pcc Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
2018-01-17 ftrushkin Expose ScopedTrace utility in public interface
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Reverting some changes, need to make the merge compile
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg Test files for corresponding changes
2018-01-15 misterg More code merges
2018-01-15 misterg Code merging
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2018-01-11 misterg continue upstream/merge, etc
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 gennadiycivil Update .travis.yml
2018-01-11 misterg Trying to fix travis
2018-01-11 misterg Upstream cl 103120214
2018-01-10 misterg More merge, cleanup
2018-01-10 misterg More merge, cleanup
2018-01-10 misterg Code merge, upstreaming accumulated changes, cleanup
2018-01-10 misterg revert
2018-01-10 misterg code merges, cleanup
2018-01-10 misterg revert googletest/test/gtest-param-test_test.cc
2018-01-10 gennadiycivil Update .travis.yml
2018-01-09 misterg code merge, cleanups
2018-01-09 misterg Upstream of cl 129104714
2018-01-09 misterg Revert one file
2018-01-09 misterg wip, cleanups/merge
2018-01-09 misterg cleanup, merge
2018-01-07 loorongjie [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
2018-01-08 misterg Small cleanups, merge
2018-01-05 coryan Use correct name for build event types.
2018-01-05 misterg Revert one file for now
2018-01-05 coryan Fixed test for pull request.
2018-01-05 coryan Fixed output and test for 'enabled_on_pr'
2018-01-04 misterg code cleanup in preparation for merges, cl 180857299
2018-01-04 coryan Optimize build matrix (#1)
2018-01-03 gennadiycivil upstreaming cl 124976692
2018-01-03 davidben Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
2017-02-10 davidben Pass the -Wmissing-declarations warning.
2018-01-02 misterg OSS Sync, cl 163329677
2018-01-02 davidben Fix testing::Combine on MSVC 2017.
2017-05-06 davidben Avoid warning C4619 in MSVC 2017.
2017-12-24 coryan Build both googletest and googlemock.
2017-12-24 coryan Create a autotools-based build for Travis.
2016-05-18 gregory.pakosz Re-enable MSVC++ C4389 warning in CmdHelperEq()
2017-12-03 coryan Run autoconf from top-level directory.
2017-12-02 romain.geissler Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both.
2017-08-14 gaspard.petit Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2017-01-20 davidben Pass MSVC's C4826 warning.

Created with:
  roll-dep src/third_party/googletest/src

Bug:  813219 
Change-Id: Id9ff41aa6a1a099749e2a36f07ca93385796b9d0
Cq-Include-Trybots: master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_msan_rel_ng;master.tryserver.chromium.linux:linux_chromium_tsan_rel_ng;master.tryserver.chromium.mac:mac_chromium_asan_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/924844
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537837}
[modify] https://crrev.com/b289091fd7db8690ed830b8e076fe60e1d9b9f0f/DEPS
[modify] https://crrev.com/b289091fd7db8690ed830b8e076fe60e1d9b9f0f/base/test/gtest_util.h

Comment 4 by p...@chromium.org, Feb 27 2018

Blocking: 801780
We'll need to roll past ce61dc54a20f00c474724d2af8bac5a2f3ebb206 for issue 801780.

Comment 5 by pwnall@chromium.org, Feb 27 2018

#4: Are you saying we can't do a roll until we include ce61dc54a20f00c474724d2af8bac5a2f3ebb206 or that it is desirable to have a roll that includes that commit?

Comment 6 by p...@chromium.org, Feb 27 2018

Sorry, I meant the latter.

Comment 7 by pwnall@chromium.org, Feb 28 2018

Thank you for clarifying!

For anyone else following -- https://crrev.com/c/923205 is going through the CQ. When it finishes, I'll immediately prepare a new roll that will include ce61dc54a20f00c474724d2af8bac5a2f3ebb206
Project Member

Comment 8 by bugdroid1@chromium.org, Feb 28 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ac3471f4cb419dd3b53a15c3dbdf08993d6628d2

commit ac3471f4cb419dd3b53a15c3dbdf08993d6628d2
Author: Victor Costan <pwnall@chromium.org>
Date: Wed Feb 28 09:20:45 2018

Roll src/third_party/googletest/src/ 7a2563a51..7d15497f7 (41 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7a2563a51456..7d15497f7538

This is a reland of https://crrev.com/c/900544 which was reverted
because it broke net_unittests on Windows Debug builds
https://crbug.com/810347. The reland bumps Google Test past
https://github.com/google/googletest/pull/1450 which contains a fix for
the net_unittest breakage.

$ git log 7a2563a51..7d15497f7 --date=short --no-merges --format='%ad %ae %s'
2018-02-23 pwnall Switch default death test style back to "fast".
2018-02-26 misterg merging unittests - 5
2018-02-23 misterg merging unitests - check 4
2018-02-23 misterg merging unitests, check
2018-02-23 misterg merging unittests - 2
2018-02-23 misterg merging unitests
2018-02-23 anders.sundman Removed trailing comma in enum
2018-02-23 cirnotoss TEST() arguments are invalid in an example
2018-02-22 misterg merges
2018-02-19 costan Fix unused function warning on Mac OS.
2018-02-13 misterg cleanup, merges
2018-02-13 misterg cleanup/merges
2018-02-13 misterg merging, cleaning up
2018-02-13 misterg merges
2018-02-13 misterg cxxx11
2018-02-13 misterg clang warnings
2018-02-13 misterg clang warnings
2018-02-13 misterg https://travis-ci.org/google/googletest/jobs/340995238
2018-02-13 misterg clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'
2018-02-13 misterg clang warning https://travis-ci.org/google/googletest/jobs/340978022
2018-02-13 misterg merges
2018-02-12 misterg moving JoinAsTuple to internal
2018-02-09 costan Fix std::iscntrl use in gtest-printers.cc
2018-02-12 misterg Merging, coniniue
2018-02-09 misterg merging
2018-02-09 misterg merges
2018-02-09 misterg merges
2018-02-07 troy.holsapple Fixed typos
2018-02-03 sokolov Add ability to throw from ASSERT
2018-02-06 gennadiycivil Include MSVC14 on PRs as well
2018-01-31 misterg Merges and also adding new bazel build mode
2018-01-30 misterg Code merges
2018-01-30 misterg Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-26 misterg Adding tests to googlemock bazel
2018-01-26 misterg Code merges
2018-01-26 lidaobing Update Documentation.md
2018-01-25 stefano.soffia.it Fix test build issue with GCC7.2.
2018-01-25 gennadiycivil Update README.md
2018-01-25 gennadiycivil Remove Visual Studio 10,11,12 from build matrix
2018-01-24 misterg placating gcc and its overzeauls size comparison warnings
2018-01-24 misterg upstream cl 182543808

Created with:
  roll-dep src/third_party/googletest/src

Bug:  813219 
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
Change-Id: Ie27a86d27a865bbf076a5aa1a4931b85bc5fceb2
Reviewed-on: https://chromium-review.googlesource.com/923205
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539763}
[modify] https://crrev.com/ac3471f4cb419dd3b53a15c3dbdf08993d6628d2/DEPS
[modify] https://crrev.com/ac3471f4cb419dd3b53a15c3dbdf08993d6628d2/third_party/googletest/README.chromium

Project Member

Comment 9 by bugdroid1@chromium.org, Feb 28 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/aab3f052362a1a7368d54ead6c66aec9a6b1be60

commit aab3f052362a1a7368d54ead6c66aec9a6b1be60
Author: Victor Costan <pwnall@chromium.org>
Date: Wed Feb 28 16:45:03 2018

Roll src/third_party/googletest/src/ 7d15497f7..fe1144246 (5 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7d15497f7538..fe1144246e7e

$ git log 7d15497f7..fe1144246 --date=short --no-merges --format='%ad %ae %s'
2018-02-27 zhangxy988 Add documentation for VariantWith.
2018-02-27 misterg gmock merging -2
2018-02-27 zhangxy988 Add matcher for std::variant.
2018-01-24 pcc Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
2018-01-25 pcc Pass -EHs-c- to disable exceptions with MSVC.

Created with:
  roll-dep src/third_party/googletest/src

Bug:  813219 , 801780
Change-Id: I50f91ea85c1f118b18820450fbff18716d63b61a
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
Reviewed-on: https://chromium-review.googlesource.com/941061
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539850}
[modify] https://crrev.com/aab3f052362a1a7368d54ead6c66aec9a6b1be60/DEPS

Status: Fixed (was: Started)

Sign in to add a comment