]> git-server-git.apps.pok.os.sepia.ceph.com Git - googletest.git/log
googletest.git
3 years agoBump version to 1.13.0 in preparation for release v1.13.0 v1.13.0-pre
Derek Mauro [Tue, 17 Jan 2023 18:36:00 +0000 (10:36 -0800)]
Bump version to 1.13.0 in preparation for release

PiperOrigin-RevId: 502626077
Change-Id: I3aad27a8b725cf73163e52ef2e28e6cdfc13082b

3 years agogmock_output_test: normalize golden file output to unix line endings
Abseil Team [Tue, 17 Jan 2023 15:12:03 +0000 (07:12 -0800)]
gmock_output_test: normalize golden file output to unix line endings

When checked out on Windows, the repo might use \r\n line endings,
and so the golden output has them.  Adjust for that.

PiperOrigin-RevId: 502577222
Change-Id: Iabfe537f6d95a49bf6bdcb934e855d28c65f6f89

3 years agoFix -Wshadow warnings
Tom Hughes [Thu, 12 Jan 2023 17:03:40 +0000 (09:03 -0800)]
Fix -Wshadow warnings

../googlemock/test/gmock-actions_test.cc:687:36: warning: declaration of ‘v’ shadows a member of ‘testing::{anonymous}::ReturnTest_SupportsReferenceLikeReturnType_Test::TestBody()::Result’ [-Wshadow]
  687 |     Result(const std::vector<int>& v) : v(&v) {}  // NOLINT
      |            ~~~~~~~~~~~~~~~~~~~~~~~~^
../googlemock/test/gmock-actions_test.cc:686:29: note: shadowed declaration is here
  686 |     const std::vector<int>* v;
      |                             ^

../googlemock/test/gmock-actions_test.cc: In constructor ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out::Out(int)’:
../googlemock/test/gmock-actions_test.cc:720:28: warning: declaration of ‘x’ shadows a member of ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out’ [-Wshadow]
  720 |     explicit Out(const int x) : x(x) {}
      |                  ~~~~~~~~~~^
../googlemock/test/gmock-actions_test.cc:718:9: note: shadowed declaration is here
  718 |     int x;
      |         ^

PiperOrigin-RevId: 501580618
Change-Id: I584710fbbe440ec724f88746e51f3be5653c32d5

3 years agoAdd an explicit #error that C++ versions less than C++14 are not supported
Derek Mauro [Thu, 12 Jan 2023 16:09:49 +0000 (08:09 -0800)]
Add an explicit #error that C++ versions less than C++14 are not supported

PiperOrigin-RevId: 501568410
Change-Id: I0f78cd96dc9204c8ec97a1cdd09a9d63a613cc5b

3 years agoUpdate GoogleTest dependencies
Derek Mauro [Wed, 11 Jan 2023 15:56:30 +0000 (07:56 -0800)]
Update GoogleTest dependencies

PiperOrigin-RevId: 501282034
Change-Id: I0314ac566dc5e117db5a06c97d303e5cf8822d61

3 years agoFix GTEST_OS_ESP8266 check
Tom Hughes [Thu, 5 Jan 2023 19:14:51 +0000 (11:14 -0800)]
Fix GTEST_OS_ESP8266 check

Everywhere else in the code, we check the value of GTEST_OS_ESP8266, not just
whether it is defined.

PiperOrigin-RevId: 499946909
Change-Id: I86f7e8947abb4e928fc24d1416d8237987b27845

3 years agoIWYU: Add missing std includes
Tom Hughes [Thu, 5 Jan 2023 16:43:19 +0000 (08:43 -0800)]
IWYU: Add missing std includes

PiperOrigin-RevId: 499893032
Change-Id: I33304802b7c82ae2d008f3ee89df38866e5f57ba

3 years agoWorkaround for GCC12 bug illustrated by https://godbolt.org/z/Pe5aE59xG
Derek Mauro [Wed, 4 Jan 2023 20:49:23 +0000 (12:49 -0800)]
Workaround for GCC12 bug illustrated by https://godbolt.org/z/Pe5aE59xG

Fixes #4108

PiperOrigin-RevId: 499556061
Change-Id: I1cb1564f9b77e1825fddc9236965f4a3b661d96a

3 years agoFix _MSC_VER check
Tom Hughes [Wed, 4 Jan 2023 14:40:19 +0000 (06:40 -0800)]
Fix _MSC_VER check

Use "#if defined(_MSC_VER)" instead of "#if _MSC_VER" to be consistent with other usages in the file and to work with the "-Wundef" warning.

PiperOrigin-RevId: 499471290
Change-Id: I34a9442eecf266afd74d4332cab7d39766df4ed9

3 years agoUse a more recent commit of googletest that uses OS constraints from
Abseil Team [Thu, 22 Dec 2022 17:30:51 +0000 (09:30 -0800)]
Use a more recent commit of googletest that uses OS constraints from
@platforms//os:* instead of from @build_tools//platforms:*

See https://github.com/bazelbuild/bazel/issues/8622

Necessary to fix #4096

Also need the fix for #4098

PiperOrigin-RevId: 497182073
Change-Id: Ifd568b088d2f779755dd20264edfd5dad12ca9cc