rebase upstream master #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mment fix example's comment
change links from former code.google.com to current github repository
AppVeyor MinGW-w64 test build
…uild-type use cmake build type defined in .travis.yml for travis builds
Wrong version reported (1.7.0 should be 1.8.0)
Performance fixes reported by cppcheck
If the user's cmakelists.txt first look for threads using find_package(Threads), then set(gtest_disable_pthreads ON), and then include googletest. GoogleTest will not look for threads. But since they have already been found before in user's cmakelists, it will use them regardless. This helped me fix build issue in darktable-org/rawspeed on windows/MSYS2, even though there are threads, and they are usable, googletest build was failing with issues about AutoHandle. I was first looking for threads, and only then including googletest, so no matter the value of gtest_disable_pthreads, it failed. The other obvious solution is for user to first include googletest, and only then look for threads by himself.
Fix WhenSorted() documentation example
This turns on optimization which allows the compiler to discover more problems and omit some more warnings.
This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
When using INSTANTIATE_TEST_CASE_P with a lambda function which uses 'info' as parameter name, GCC complains that this would shadow parameter 'info' used in the macro's VA_ARGS call.
As mentioned in issue google#360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." google#360
It's not necessary, as the target_link_libraries command contains an absolute path already, and the path given doesn't exist anymore, leading only to linker warnings like: ld: warning: directory not found for option '-L/Users/travis/build/google/googletest/build/googlemock/gtest/src'
Trying to get around mongoDB expired keys, etc
Upstream/merge
Fix double free when building Gtest/GMock in shared libraries and lin…
Code merging
wjwwood
approved these changes
Jan 18, 2018
|
I force-pushed the changes to the |
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is necessary to compile without warnings in Visual Studio 2017. The rebase pulls in several fixes which have been applied.
The remaining warning are coming from packages which embed their own
gtestversion:Instead of merging the PR I would propose to force push the changes to the default branch. That keeps the history simpler, makes future rebases trivial, and makes it easier to see the custom commits applied by us.
The change doesn't affect the "normal" builds: