New issue
Advanced search Search tips

Issue 829773 link

Starred by 4 users

Issue metadata

Status: Fixed
Owner:
Closed: Apr 2018
Components:
EstimatedDays: ----
NextAction: ----
OS: Mac
Pri: 3
Type: Bug



Sign in to add a comment

Migrate testing code from <tr1/tuple> types to <tuple>

Project Member Reported by pwnall@chromium.org, Apr 6 2018

Issue description

googletest used to rely std::tr1::tuple, std::tr1::get, and std::tr1::make_tuple in <tr1/tuple> for parametrized tests. googletest can now be configured to use the standardized versions of these in <tuple>, and our supported toolchains have all have <tuple> thanks to C++11 support.

https://crrev.com/c/998849 sets up googletest to use the standardized versions, and aliases them in std::tr1 (in gtest/internal/custom/gtest-port.h). Defining std::tr1 is technically undefined behavior, but our supported compilers seem to be bearing with us. This bug tracks migrating from std::tr1::* to std::* and removing the aliases.
 
Project Member

Comment 1 by bugdroid1@chromium.org, Apr 6 2018

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

commit 23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895
Author: Victor Costan <pwnall@chromium.org>
Date: Fri Apr 06 17:58:23 2018

Roll src/third_party/googletest/src/ a325ad2db..82febb8ea (47 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..82febb8eafc0

This CL also aliases <tr1/tuple> types used by googletest to C++11
<tuple> types, to prepare for gradually transitioning the Chromium
codebase from std::tr1::tuple to std::tuple.

$ git log a325ad2db..82febb8ea --date=short --no-merges --format='%ad %ae %s'
2018-04-05 misterg Merging gMock, 2
2018-04-05 misterg formatting
2018-04-05 misterg And more MCVS warnings
2018-04-05 misterg fixing MCVS warn
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Merging matchers test
2018-04-05 misterg Merging matchers test
2018-04-04 misterg bad cut/paste
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 misterg Fixing build break on MSVC
2018-04-04 misterg merging gmock matchers 1
2018-04-04 fo40225 fix build break on locale windows
2018-04-04 misterg Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-03 misterg Upstreaming, cl 191344765
2018-04-03 misterg merging port, cont. 191443078
2018-04-03 misterg merging, cont - 2
2018-04-03 misterg merging gtest-port.h , 191439094
2018-04-03 misterg merging, just comments format
2018-04-03 misterg testing, merge
2018-04-03 misterg Testing, gtest-port.h merge
2018-04-02 misterg merging gtest-port.h, again - 1
2018-03-29 gennadiycivil Include OSX builds back into PR builds
2018-03-29 gennadiycivil Revert "merging gtest-port 1 of N"
2018-03-29 gennadiycivil Revert "merging gtest-port, 2"
2018-03-29 leissa typo
2018-03-29 misterg merging gtest-port, 2
2018-03-28 leissa provide alternative for DebugBreak()
2018-03-27 misterg merging gtest-port 1 of N
2018-03-26 misterg merges 1
2018-03-26 misterg merges, gtest
2018-03-26 misterg merging gmock-matchers.h 3
2018-03-26 misterg merging gmock-matchers.h 2
2018-03-26 misterg Upstreaming FloatingEq2Matcher,
2018-03-23 misterg Merging gmock-matchers.h -2
2018-03-23 misterg gmock-matchers merging -2
2018-03-22 misterg merging, gmock -1
2018-03-22 misterg reverting gtest_list_tests_unittest.py
2018-03-22 gennadiycivil Update appveyor.yml
2018-03-22 misterg more merges
2018-03-22 misterg more merges
2018-03-21 misterg More merges
2018-03-16 misterg cl 189032107, again
2018-03-16 misterg cl 189032107
2018-03-15 misterg merge, again, IsRecursiveContainer

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

Bug:  829773 
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
Change-Id: Ic865698379d3626a5165f81b56104223ad1558d9
Reviewed-on: https://chromium-review.googlesource.com/987696
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548853}
[modify] https://crrev.com/23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895/DEPS
[modify] https://crrev.com/23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895/media/filters/ffmpeg_glue_unittest.cc
[modify] https://crrev.com/23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895/third_party/googletest/BUILD.gn
[add] https://crrev.com/23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895/third_party/googletest/custom/gtest/internal/custom/gtest-port.h

Project Member

Comment 2 by bugdroid1@chromium.org, Apr 6 2018

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

commit aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f
Author: Victor Costan <pwnall@chromium.org>
Date: Fri Apr 06 19:05:26 2018

Migrate from tr1/tuple to tuple in parametrized unit tests.

Bug:  829773 

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
Change-Id: I0b26a5ea02c7f077285849979e5a819e31b7d503
Reviewed-on: https://chromium-review.googlesource.com/998849
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548878}
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/cc/trees/layer_tree_host_common_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/chrome/browser/media/encrypted_media_browsertest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/ntp_tiles/most_visited_sites_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/viz/common/gl_helper_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/viz/common/yuv_readback_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/viz/service/display/gl_renderer_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/viz/service/display/renderer_pixeltest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/components/viz/service/frame_sinks/frame_sink_manager_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/content/browser/download/download_manager_impl_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/content/browser/media/encrypted_media_browsertest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/extensions/browser/api/bluetooth/bluetooth_private_apitest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/extensions/browser/api/cast_channel/cast_channel_apitest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/extensions/browser/api/document_scan/document_scan_api_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/headless/public/util/virtual_time_controller_test.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/audio/audio_debug_file_writer_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/base/audio_converter_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/base/audio_renderer_mixer_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/base/gmock_callback_support.h
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/base/pipeline_impl_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/base/sinc_resampler_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/media/filters/video_renderer_algorithm_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/net/test/embedded_test_server/embedded_test_server_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/remoting/protocol/validating_authenticator_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/third_party/cacheinvalidation/src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/third_party/cacheinvalidation/src/google/cacheinvalidation/test/test-utils.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/third_party/cacheinvalidation/src/google/cacheinvalidation/test/test-utils.h
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/ui/gfx/color_space_unittest.cc
[modify] https://crrev.com/aeb7f8e67e32389a5f4ee02ed5dd6b6e98dac00f/ui/gfx/color_transform_unittest.cc

Project Member

Comment 3 by bugdroid1@chromium.org, Apr 7 2018

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

commit bd78d300314bbaa01ab0f4c3c2b1893bbcefaf50
Author: Victor Costan <pwnall@chromium.org>
Date: Sat Apr 07 02:02:05 2018

Revert "Roll src/third_party/googletest/src/ a325ad2db..82febb8ea (47 commits)"

This reverts commit 23f0c0829f997f16fe4bfdcd0ad7fdd388cf3895.

Reason for revert: Probably broke Linux CFI bot.  https://crbug.com/830017 

Original change's description:
> Roll src/third_party/googletest/src/ a325ad2db..82febb8ea (47 commits)
> 
> https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..82febb8eafc0
> 
> This CL also aliases <tr1/tuple> types used by googletest to C++11
> <tuple> types, to prepare for gradually transitioning the Chromium
> codebase from std::tr1::tuple to std::tuple.
> 
> $ git log a325ad2db..82febb8ea --date=short --no-merges --format='%ad %ae %s'
> 2018-04-05 misterg Merging gMock, 2
> 2018-04-05 misterg formatting
> 2018-04-05 misterg And more MCVS warnings
> 2018-04-05 misterg fixing MCVS warn
> 2018-04-05 misterg Have to wait for this one
> 2018-04-05 misterg Have to wait for this one
> 2018-04-05 misterg Merging matchers test
> 2018-04-05 misterg Merging matchers test
> 2018-04-04 misterg bad cut/paste
> 2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
> 2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
> 2018-04-04 misterg Address MSVC warning C4503, decorated name length exceeded, name was truncated
> 2018-04-04 misterg Fixing build break on MSVC
> 2018-04-04 misterg merging gmock matchers 1
> 2018-04-04 fo40225 fix build break on locale windows
> 2018-04-04 misterg Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
> 2018-04-03 misterg Upstreaming, cl 191344765
> 2018-04-03 misterg merging port, cont. 191443078
> 2018-04-03 misterg merging, cont - 2
> 2018-04-03 misterg merging gtest-port.h , 191439094
> 2018-04-03 misterg merging, just comments format
> 2018-04-03 misterg testing, merge
> 2018-04-03 misterg Testing, gtest-port.h merge
> 2018-04-02 misterg merging gtest-port.h, again - 1
> 2018-03-29 gennadiycivil Include OSX builds back into PR builds
> 2018-03-29 gennadiycivil Revert "merging gtest-port 1 of N"
> 2018-03-29 gennadiycivil Revert "merging gtest-port, 2"
> 2018-03-29 leissa typo
> 2018-03-29 misterg merging gtest-port, 2
> 2018-03-28 leissa provide alternative for DebugBreak()
> 2018-03-27 misterg merging gtest-port 1 of N
> 2018-03-26 misterg merges 1
> 2018-03-26 misterg merges, gtest
> 2018-03-26 misterg merging gmock-matchers.h 3
> 2018-03-26 misterg merging gmock-matchers.h 2
> 2018-03-26 misterg Upstreaming FloatingEq2Matcher,
> 2018-03-23 misterg Merging gmock-matchers.h -2
> 2018-03-23 misterg gmock-matchers merging -2
> 2018-03-22 misterg merging, gmock -1
> 2018-03-22 misterg reverting gtest_list_tests_unittest.py
> 2018-03-22 gennadiycivil Update appveyor.yml
> 2018-03-22 misterg more merges
> 2018-03-22 misterg more merges
> 2018-03-21 misterg More merges
> 2018-03-16 misterg cl 189032107, again
> 2018-03-16 misterg cl 189032107
> 2018-03-15 misterg merge, again, IsRecursiveContainer
> 
> Created with:
>   roll-dep src/third_party/googletest/src
> 
> Bug:  829773 
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
> Change-Id: Ic865698379d3626a5165f81b56104223ad1558d9
> Reviewed-on: https://chromium-review.googlesource.com/987696
> Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Victor Costan <pwnall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548853}

TBR=thakis@chromium.org,chcunningham@chromium.org,pwnall@chromium.org

Bug:  830017 ,  829773 
Change-Id: I25807b133014e7816f6790080fce964aaaa65168
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official
Reviewed-on: https://chromium-review.googlesource.com/1000414
Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549014}
[modify] https://crrev.com/bd78d300314bbaa01ab0f4c3c2b1893bbcefaf50/DEPS
[modify] https://crrev.com/bd78d300314bbaa01ab0f4c3c2b1893bbcefaf50/media/filters/ffmpeg_glue_unittest.cc
[modify] https://crrev.com/bd78d300314bbaa01ab0f4c3c2b1893bbcefaf50/third_party/googletest/BUILD.gn
[delete] https://crrev.com/736e26fa2b93318635af46024207ffe55b1f2390/third_party/googletest/custom/gtest/internal/custom/gtest-port.h

Project Member

Comment 5 by bugdroid1@chromium.org, Apr 9 2018

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

commit 3a6aeb23ad7c5190919480d4ec8c224a2865297b
Author: angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Mon Apr 09 10:57:46 2018

Roll src/third_party/angle/ 6816d8438..6c59e4a15 (1 commit)

https://chromium.googlesource.com/angle/angle.git/+log/6816d84382d5..6c59e4a156c3

$ git log 6816d8438..6c59e4a15 --date=short --no-merges --format='%ad %ae %s'
2018-04-05 pwnall Migrate from <tr1/tuple> to <tuple> types.

Created with:
  roll-dep src/third_party/angle
BUG= chromium:829773 


The AutoRoll server is located here: https://angle-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
TBR=ynovikov@chromium.org

Change-Id: I00cb193a7ef81f6800d8f1f2c879716e62546bb3
Reviewed-on: https://chromium-review.googlesource.com/1002632
Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#549147}
[modify] https://crrev.com/3a6aeb23ad7c5190919480d4ec8c224a2865297b/DEPS

Project Member

Comment 6 by bugdroid1@chromium.org, Apr 10 2018

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

commit 849ff90f82bab568e7eb3b37fd0e59a4b38492a4
Author: Victor Costan <pwnall@chromium.org>
Date: Tue Apr 10 02:15:58 2018

Roll src/third_party/googletest/src/ a325ad2db..7e5f90d37 (46 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..7e5f90d3780d

This is a less ambitious version of https://crrev.com/c/987696 which was
reverted in https://crrev.com/c/1000414 because it broke the Linux CFI
build bot  https://crbug.com/830017 

$ git log a325ad2db..7e5f90d37 --date=short --no-merges --format='%ad %ae %s'
2018-04-05 misterg formatting
2018-04-05 misterg And more MCVS warnings
2018-04-05 misterg fixing MCVS warn
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Merging matchers test
2018-04-05 misterg Merging matchers test
2018-04-04 misterg bad cut/paste
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 misterg Fixing build break on MSVC
2018-04-04 misterg merging gmock matchers 1
2018-04-04 fo40225 fix build break on locale windows
2018-04-04 misterg Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-03 misterg Upstreaming, cl 191344765
2018-04-03 misterg merging port, cont. 191443078
2018-04-03 misterg merging, cont - 2
2018-04-03 misterg merging gtest-port.h , 191439094
2018-04-03 misterg merging, just comments format
2018-04-03 misterg testing, merge
2018-04-03 misterg Testing, gtest-port.h merge
2018-04-02 misterg merging gtest-port.h, again - 1
2018-03-29 gennadiycivil Include OSX builds back into PR builds
2018-03-29 gennadiycivil Revert "merging gtest-port 1 of N"
2018-03-29 gennadiycivil Revert "merging gtest-port, 2"
2018-03-29 leissa typo
2018-03-29 misterg merging gtest-port, 2
2018-03-28 leissa provide alternative for DebugBreak()
2018-03-27 misterg merging gtest-port 1 of N
2018-03-26 misterg merges 1
2018-03-26 misterg merges, gtest
2018-03-26 misterg merging gmock-matchers.h 3
2018-03-26 misterg merging gmock-matchers.h 2
2018-03-26 misterg Upstreaming FloatingEq2Matcher,
2018-03-23 misterg Merging gmock-matchers.h -2
2018-03-23 misterg gmock-matchers merging -2
2018-03-22 misterg merging, gmock -1
2018-03-22 misterg reverting gtest_list_tests_unittest.py
2018-03-22 gennadiycivil Update appveyor.yml
2018-03-22 misterg more merges
2018-03-22 misterg more merges
2018-03-21 misterg More merges
2018-03-16 misterg cl 189032107, again
2018-03-16 misterg cl 189032107
2018-03-15 misterg merge, again, IsRecursiveContainer

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

Bug:  829773 
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Change-Id: Id5eec3d583a3b1fac953fba5bd702e9714099cf3
Reviewed-on: https://chromium-review.googlesource.com/1002612
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549380}
[modify] https://crrev.com/849ff90f82bab568e7eb3b37fd0e59a4b38492a4/DEPS
[modify] https://crrev.com/849ff90f82bab568e7eb3b37fd0e59a4b38492a4/third_party/googletest/BUILD.gn
[add] https://crrev.com/849ff90f82bab568e7eb3b37fd0e59a4b38492a4/third_party/googletest/custom/gtest/internal/custom/gtest-port.h

Project Member

Comment 7 by bugdroid1@chromium.org, Apr 10 2018

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

commit b1d3788892127927b7ee3aaf85015c12b0be86ff
Author: Victor Costan <pwnall@chromium.org>
Date: Tue Apr 10 19:35:23 2018

Migrate from <tr1/tuple> to <tuple> types in missed files.

This migrates the std::tr1 occurrences missed by https://crrev.com/c/999181.

Bug:  829773 
Change-Id: I8011040e8f76fc440096b11e795fbd8617266348
Reviewed-on: https://chromium-review.googlesource.com/1004441
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549615}
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/chrome/installer/util/language_selector_unittest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/chromecast/media/cma/backend/multizone_backend_unittest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/components/ntp_snippets/breaking_news/breaking_news_gcm_app_handler_unittest.cc
[modify] https://crrev.com/b1d3788892127927b7ee3aaf85015c12b0be86ff/ui/events/event_unittest.cc

If I understood it correctly, ::testing::Combine no longer depends on tr1/tuple, right?

I'm asking because the build with libstdc++ is currently broken due to it having both <tr1/tuple> as well as <tuple>, which leads to gtest-port.h setting both GTEST_HAS_TR1_TUPLE=1 and GTEST_HAS_STD_TUPLE_=1 and including both headers:

In file included from ../../third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h:754:0,
                 from ../../third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h:39,
                 from ../../third_party/googletest/src/googletest/include/gtest/gtest.h:58,
                 from ../../testing/gtest/include/gtest/gtest.h:10,
                 from ../../base/test/gtest_util.h:15,
                 from ../../base/test/gtest_util.cc:5:
/usr/include/c++/7/tr1/tuple:130:11: error: redefinition of ‘class std::tuple<_Elements>’
     class tuple : public _Tuple_impl<0, _Elements...>
           ^~~~~
In file included from /usr/include/c++/7/functional:54:0,
                 from ../../base/strings/string16.h:33,
                 from ../../base/strings/string_piece_forward.h:12,
                 from ../../base/logging.h:22,
                 from ../../base/test/gtest_util.h:13,
                 from ../../base/test/gtest_util.cc:5:
/usr/include/c++/7/tuple:556:11: note: previous definition of ‘class std::tuple<_Elements>’
     class tuple : public _Tuple_impl<0, _Elements...>
           ^~~~~

Would you be OK with setting GTEST_HAS_TR1_TUPLE=0 in the "gtest_config" GN target?

One other thing: the "gtest_config" target sets GTEST_HAS_STD_TUPLE=1, but that doesn't seem to have any effect. The internal gtest macro has a trailing '_' in its name, and it seems to be an internal macro that's defined based on GTEST_LANG_CXX11. Does anything break if you don't set it in GN?
Project Member

Comment 9 by bugdroid1@chromium.org, Apr 12 2018

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

commit 1e0821894f595b201b4d58e540404da7d09a0214
Author: Victor Costan <pwnall@chromium.org>
Date: Thu Apr 12 21:06:47 2018

Roll src/third_party/googletest/src/ 7e5f90d37..b640d8743 (50 commits)

This roll includes 1324e2d706d739217cceae361259a5cc01d1ff41 which fixes
the undefiend behavior breaking the Linux CFI bot introduced in
fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7e5f90d3780d..b640d8743d85

$ git log 7e5f90d37..b640d8743 --date=short --no-merges --format='%ad %ae %s'
2018-04-09 costan Remove multiple inheritance from "unintesting call" mock classes.
2018-04-11 misterg ...merging
2018-04-11 misterg merging
2018-04-11 misterg Upstream cl/192179348
2018-04-11 misterg merging
2018-04-11 misterg ..and this should be it
2018-04-11 misterg more
2018-04-11 misterg pizza work, cont
2018-04-11 misterg osx pizzas, cont
2018-04-11 misterg fixing osx pizza
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 gennadiycivil Include gcc on mac into PR matrix
2018-04-09 gennadiycivil Revert "gmock actions 2"
2018-04-09 misterg ... and this
2018-04-09 misterg this should be it
2018-04-09 misterg yet more
2018-04-09 misterg formatting
2018-04-09 misterg tuning
2018-04-09 misterg tuning
2018-04-09 misterg more
2018-04-09 misterg cont
2018-04-09 misterg msvc
2018-04-09 misterg more msvc
2018-04-09 misterg msvc 14
2018-04-09 misterg testing msvc again
2018-04-09 misterg More msvc 14
2018-04-09 misterg And also silence for MSVS14
2018-04-09 misterg preproc syntax ( I can never remember it)
2018-04-09 misterg syntax
2018-04-09 misterg cont.
2018-04-09 misterg continued
2018-04-06 costan Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
2018-04-06 misterg more mcvs fixing
2018-04-06 misterg linkage, fixing MSVC
2018-04-06 misterg fixing MSVC
2018-04-06 misterg more warnings
2018-04-06 misterg more warnings
2018-04-06 misterg more MSVC warnings
2018-04-06 misterg warnings
2018-04-06 misterg cont - 2
2018-04-06 misterg cont
2018-04-06 misterg more warnings
2018-04-06 misterg deal with MSVC warn, cont 1
2018-04-06 misterg Cont. deal with MCVS warnings
2018-04-06 misterg Deal with MCVS warnings
2018-04-06 misterg merging gmock-actions 2
2018-04-05 misterg Merging gMock, 2

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

Bug:  830017 ,  829773 
Change-Id: I2a20f5e12c1b0475e15c98251f9c3100247e14b9
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1004440
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550359}
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/DEPS
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/media/filters/ffmpeg_glue_unittest.cc
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/third_party/googletest/BUILD.gn

 Issue 832290  has been merged into this issue.
Project Member

Comment 11 by bugdroid1@chromium.org, Apr 13 2018

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

commit a409aebbf4f223aa8da75c50db1963a306e1506a
Author: Victor Costan <pwnall@chromium.org>
Date: Fri Apr 13 17:33:54 2018

googletest: Remove tr1/tuple forwarding hacks.

Bug:  829773 
Change-Id: I54489ef9b232a20065d3fe78d884609bb65b4a87
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1011411
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550670}
[modify] https://crrev.com/a409aebbf4f223aa8da75c50db1963a306e1506a/third_party/googletest/BUILD.gn
[delete] https://crrev.com/7431d0b949fb37bd02b4a2fcb6d2bacafd6adb21/third_party/googletest/custom/gtest/internal/custom/gtest-port.h

Status: Fixed (was: Started)
The CLs here appear to have stuck, so this is done.
Project Member

Comment 13 by bugdroid1@chromium.org, Apr 17 2018

Labels: merge-merged-testbranch
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1e0821894f595b201b4d58e540404da7d09a0214

commit 1e0821894f595b201b4d58e540404da7d09a0214
Author: Victor Costan <pwnall@chromium.org>
Date: Thu Apr 12 21:06:47 2018

Roll src/third_party/googletest/src/ 7e5f90d37..b640d8743 (50 commits)

This roll includes 1324e2d706d739217cceae361259a5cc01d1ff41 which fixes
the undefiend behavior breaking the Linux CFI bot introduced in
fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7e5f90d3780d..b640d8743d85

$ git log 7e5f90d37..b640d8743 --date=short --no-merges --format='%ad %ae %s'
2018-04-09 costan Remove multiple inheritance from "unintesting call" mock classes.
2018-04-11 misterg ...merging
2018-04-11 misterg merging
2018-04-11 misterg Upstream cl/192179348
2018-04-11 misterg merging
2018-04-11 misterg ..and this should be it
2018-04-11 misterg more
2018-04-11 misterg pizza work, cont
2018-04-11 misterg osx pizzas, cont
2018-04-11 misterg fixing osx pizza
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg merging
2018-04-10 misterg RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 gennadiycivil Include gcc on mac into PR matrix
2018-04-09 gennadiycivil Revert "gmock actions 2"
2018-04-09 misterg ... and this
2018-04-09 misterg this should be it
2018-04-09 misterg yet more
2018-04-09 misterg formatting
2018-04-09 misterg tuning
2018-04-09 misterg tuning
2018-04-09 misterg more
2018-04-09 misterg cont
2018-04-09 misterg msvc
2018-04-09 misterg more msvc
2018-04-09 misterg msvc 14
2018-04-09 misterg testing msvc again
2018-04-09 misterg More msvc 14
2018-04-09 misterg And also silence for MSVS14
2018-04-09 misterg preproc syntax ( I can never remember it)
2018-04-09 misterg syntax
2018-04-09 misterg cont.
2018-04-09 misterg continued
2018-04-06 costan Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
2018-04-06 misterg more mcvs fixing
2018-04-06 misterg linkage, fixing MSVC
2018-04-06 misterg fixing MSVC
2018-04-06 misterg more warnings
2018-04-06 misterg more warnings
2018-04-06 misterg more MSVC warnings
2018-04-06 misterg warnings
2018-04-06 misterg cont - 2
2018-04-06 misterg cont
2018-04-06 misterg more warnings
2018-04-06 misterg deal with MSVC warn, cont 1
2018-04-06 misterg Cont. deal with MCVS warnings
2018-04-06 misterg Deal with MCVS warnings
2018-04-06 misterg merging gmock-actions 2
2018-04-05 misterg Merging gMock, 2

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

Bug:  830017 ,  829773 
Change-Id: I2a20f5e12c1b0475e15c98251f9c3100247e14b9
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1004440
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550359}
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/DEPS
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/media/filters/ffmpeg_glue_unittest.cc
[modify] https://crrev.com/1e0821894f595b201b4d58e540404da7d09a0214/third_party/googletest/BUILD.gn

Project Member

Comment 14 by bugdroid1@chromium.org, Apr 17 2018

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

commit a409aebbf4f223aa8da75c50db1963a306e1506a
Author: Victor Costan <pwnall@chromium.org>
Date: Fri Apr 13 17:33:54 2018

googletest: Remove tr1/tuple forwarding hacks.

Bug:  829773 
Change-Id: I54489ef9b232a20065d3fe78d884609bb65b4a87
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1011411
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550670}
[modify] https://crrev.com/a409aebbf4f223aa8da75c50db1963a306e1506a/third_party/googletest/BUILD.gn
[delete] https://crrev.com/7431d0b949fb37bd02b4a2fcb6d2bacafd6adb21/third_party/googletest/custom/gtest/internal/custom/gtest-port.h

Sign in to add a comment