New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include googletest as a submodule #3993

Merged
merged 4 commits into from Mar 26, 2018

Conversation

Projects
6 participants
@coryan
Contributor

coryan commented Dec 3, 2017

This fixes #236. Currently it patches googletest to support autoconf / automake builds, because google/googletest#776. I have submitted google/googletest#1341 to fix that problem, but until it is accepted the patches work around the underlying googletest issue.

The builds with cmake and bazel do not need such hacks.

Remove unhelpful build warnings
-Wno-writable-strings removes 230 "ISO C++11 does not allow conversion from
string literal to 'char *'" warnings from TensorFlow test / build output.
These happen because pyext/ sources pass string literals to Python C API data
structures, e.g. PyGetSetDef, which for some reason were designed to not have
the const qualifier.
@grpc-kokoro

This comment has been minimized.

grpc-kokoro commented Dec 3, 2017

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure.

1 similar comment
@grpc-kokoro

This comment has been minimized.

grpc-kokoro commented Dec 3, 2017

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure.

@googlebot googlebot added the cla: yes label Dec 3, 2017

@xfxyjwf xfxyjwf self-requested a review Dec 6, 2017

@coryan

This comment has been minimized.

Contributor

coryan commented Jan 10, 2018

@xfxyjwf PTAL. The changes in googletest are in, it works correctly with autoconf/automake now, and the builds are passing.

@xfxyjwf

Please squash the commits into one and update the commit message.

@@ -1,3 +1,7 @@
[submodule "third_party/benchmark"]
path = third_party/benchmark
url = https://github.com/google/benchmark.git
[submodule "third_party/googletest"]

This comment has been minimized.

@xfxyjwf

xfxyjwf Jan 10, 2018

Contributor

Can you pin this submodule to a specific googletest version (a tag or a commit)?

This comment has been minimized.

@coryan

coryan Jan 10, 2018

Contributor

I believe it is already. The SHA1 of the commit a submodule points to is stored directly in the git database:

https://stackoverflow.com/a/5033973

You can see that it already points at a SHA1 here:

https://github.com/coryan/protobuf/tree/fix-issue-236-gmock-as-submodule/third_party

${protobuf_source_dir}/gmock/include
${googlemock_source_dir}
${googletest_source_dir}
${googletest_source_dir}/include

This comment has been minimized.

@xfxyjwf

xfxyjwf Jan 10, 2018

Contributor

Remove duplicated lines here.

This comment has been minimized.

@coryan

coryan Jan 10, 2018

Contributor

Sorry, I do not see the duplicates. Line 12 points to googlemock, while line 13 is googletest. Or maybe you wanted be to look elsewhere and I missed it?

@coryan

This comment has been minimized.

Contributor

coryan commented Jan 10, 2018

PTAL. Ping me if I am just being dumb and do not see what is it you are asking me to do.

@coryan

This comment has been minimized.

Contributor

coryan commented Mar 22, 2018

Ping, is there something else I should be doing here?

@xfxyjwf xfxyjwf self-assigned this Mar 22, 2018

@xfxyjwf xfxyjwf added this to To Do in Weekly Fixit via automation Mar 26, 2018

@xfxyjwf xfxyjwf merged commit 3c5442a into protocolbuffers:master Mar 26, 2018

30 of 32 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
MacOS JRuby (Allowed Failure) Kokoro build finished
Details
Linux 32-bit Kokoro build finished
Details
Linux C# Kokoro build finished
Details
Linux C++ Distcheck Kokoro build finished
Details
Linux Golang Kokoro build finished
Details
Linux Java Compatibility Kokoro build finished
Details
Linux Java JDK 7 Kokoro build finished
Details
Linux Java Oracle 7 Kokoro build finished
Details
Linux JavaNano JDK 7 Kokoro build finished
Details
Linux JavaNano Oracle 7 Kokoro build finished
Details
Linux JavaScript Kokoro build finished
Details
Linux PHP Kokoro build finished
Details
Linux Python Kokoro build finished
Details
Linux Python C++ Kokoro build finished
Details
Linux Python Compatibility Kokoro build finished
Details
Linux Ruby Kokoro build finished
Details
MacOS C++ Kokoro build finished
Details
MacOS C++ Distcheck Kokoro build finished
Details
MacOS JavaScript Kokoro build finished
Details
MacOS Obj-C CocoaPods Integration Kokoro build finished
Details
MacOS Obj-C OS X Kokoro build finished
Details
MacOS Obj-C iOS Debug (Allowed Failure) Kokoro build finished
Details
MacOS Obj-C iOS Release (Allowed Failure) Kokoro build finished
Details
MacOS PHP5.6 Kokoro build finished
Details
MacOS PHP7.0 Kokoro build finished
Details
MacOS Python Kokoro build finished
Details
MacOS Python C++ (Allowed Failure) Kokoro build finished
Details
MacOS Ruby 2.1 Kokoro build finished
Details
MacOS Ruby 2.2 (Allowed Failure) Kokoro build finished
Details
cla/google All necessary CLAs are signed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

Weekly Fixit automation moved this from To Do to Done Mar 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment