1343557 - Update version of gtest in tree to 1.7.0

Status: RESOLVED FIXED

(Testing :: General, enhancement, P1)

Description

[Dan Minor [:dminor]]

The current version in tree is 1.6.0. The latest version is 1.7.0.

In Bug 964133 we want to start building the webrtc.org gtests, which use 1.7.0. If we want to avoid having multiple versions of gtest in tree, we need to update the current version in tree to 1.7.0.

Comment 1

[Dan Minor [:dminor]]

So it looks like the worst part of this is going to be that that the INSTANTIATE_TEST_CASE_P macro has been changed to accept an "optional" last argument like this:

#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...)

whereas before it was:

# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator)

Unfortunately, leaving the variable arguments empty is not legal C++ and gcc will issue errors and warnings, so you can't make a parameter optional in the way they are trying. I was able to disable the warning I saw on my linux box using -Wno-gnu-zero-variadic-macro-arguments, but I'm getting build errors on Try with linux32 due to the use of "-pedantic-error" while building test files.

I guess one solution would be to disable -pedantic-error just for the affected tests. Another would be to change the macro back to the way it was. Neither solution makes me all that happy.

Limited try run here: https://treeherder.mozilla.org/#/jobs?repo=try&author=[e-mail]&selectedJob=81223936

The tests also build and run on my local machine.

Comment 2

[Dan Minor [:dminor]]

Actually, looks like I might need to set -no-pedantic-errors in just one place, and there's already a precedent for disabling errors/warnings due to gtest there, so maybe this isn't so bad after all.

Comment 3

[Dan Minor [:dminor]]

Try run for all platforms here: https://treeherder.mozilla.org/#/jobs?repo=try&revision=73968ed21fbed83868341dea581d10678eed0a2d

Comment 4

[Dan Minor [:dminor]]

Attachment: Bug 1343557 - Update gtest and gmock to 1.7.0; .mielczarek

Import made from git revision ba638689e40fc60c2e5194fc777bf30541deeff8.

Review commit: https://reviewboard.mozilla.org/r/117554/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117554/

Comment 5

[Dan Minor [:dminor]]

Attachment: Bug 1343557 - Update build for gtest and gmock 1.7.0; .mielczarek

I've moved the mozilla specific gtest stuff to link directly in xul-gtest
rather than in the gtest static library to make it possible for standalone
programs to link against this library and not have to link
against other mozilla libraries. This allows us to build
media/webrtc/signaling/fuzztest against this version of gtest rather than the
webrtc version of gtest, which I plan to remove in a follow on bug.

I had to add a global disable for -Wgnu-zero-variadic-macro-arguments as we
hit that everywhere we use the INSTANTIATE_TEST_CASE_P macro.

This brings forward the fix from Bug 844630 to the visibility of environ in
gtest-death-test.cc.

I also removed code that set GTEST_API_ to a visibility that conflicts with
what we've defined elsewhere in tree.

Review commit: https://reviewboard.mozilla.org/r/117556/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117556/

Comment 6

[Dan Minor [:dminor]]

Attachment: Bug 1343557 - Make PfxInstr::operator== const;

Review commit: https://reviewboard.mozilla.org/r/117558/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117558/

Comment 7

[Dan Minor [:dminor]]

Attachment: Bug 1343557 - Make operator AutoCreateAndDestroyReentrantMonitor::ReentrantMonitor* const;

Review commit: https://reviewboard.mozilla.org/r/117560/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117560/

Comment 8

[Dan Minor [:dminor]]

Attachment: Bug 1343557 - Disable -pedantic-errors for pkix gtests;

Review commit: https://reviewboard.mozilla.org/r/117562/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117562/

Comment 9

[(not currently active) Ted Mielczarek]

Comment on attachment 8843968 [details]
Bug 1343557 - Update gtest and gmock to 1.7.0; .mielczarek

https://reviewboard.mozilla.org/r/117554/#review119244

Comment 10

[(not currently active) Ted Mielczarek]

Comment on attachment 8843969 [details]
Bug 1343557 - Update build for gtest and gmock 1.7.0; .mielczarek

https://reviewboard.mozilla.org/r/117556/#review119246

Nice! I remember running into issues when I was changing the gyp_reader code due to having the WebRTC copy of gtest + the testing/gtest copy. Building fewer copies of gtest definitely sounds nice. :)

Comment 11

[Benjamin Smedberg]

Comment on attachment 8843971 [details]
Bug 1343557 - Make operator AutoCreateAndDestroyReentrantMonitor::ReentrantMonitor* const;

https://reviewboard.mozilla.org/r/117560/#review119362

Comment 12

[Dana Keeler (she/her) (use needinfo) [:keeler]]

Comment on attachment 8843972 [details]
Bug 1343557 - Disable -pedantic-errors for pkix gtests;

https://reviewboard.mozilla.org/r/117562/#review119762

Ok, this seems reasonable.

Comment 13

[Julian Seward [:jseward]]

Comment on attachment 8843970 [details]
Bug 1343557 - Make PfxInstr::operator== const;

https://reviewboard.mozilla.org/r/117558/#review120496

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6f0451a83b92
Update gtest and gmock to 1.7.0; r=ted.mielczarek
https://hg.mozilla.org/integration/autoland/rev/b5daeb2d408d
Update build for gtest and gmock 1.7.0; r=ted.mielczarek
https://hg.mozilla.org/integration/autoland/rev/37b0f7cc68d5
Make PfxInstr::operator== const; r=jseward
https://hg.mozilla.org/integration/autoland/rev/66e004568ab2
Make operator AutoCreateAndDestroyReentrantMonitor::ReentrantMonitor* const; r=bsmedberg
https://hg.mozilla.org/integration/autoland/rev/bfd89f8fb93a
Disable -pedantic-errors for pkix gtests; r=keeler

Comment 15

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/6f0451a83b92
https://hg.mozilla.org/mozilla-central/rev/b5daeb2d408d
https://hg.mozilla.org/mozilla-central/rev/37b0f7cc68d5
https://hg.mozilla.org/mozilla-central/rev/66e004568ab2
https://hg.mozilla.org/mozilla-central/rev/bfd89f8fb93a