Skip to content
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

Update GoogleTest #430

Merged
merged 3 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ A full code documentation may be built, see [here](#get_documentation).
* Requirements:
- the `gcc` or `clang/llvm` toolchains compliant with `C99`
- for unit tests (using `googletest`)
- toolchains compliant with `C++14`
- toolchains compliant with `C++17`
- `POSIX API`
- GNU-compliant `make`
- On Windows OS: an installation of `cygwin`
Expand Down
2 changes: 1 addition & 1 deletion external/googletest
Submodule googletest updated 76 files
+0 −43 .github/workflows/gtest-ci.yml
+1 −0 .gitignore
+17 −0 BUILD.bazel
+11 −2 CMakeLists.txt
+4 −4 CONTRIBUTING.md
+1 −0 CONTRIBUTORS
+69 −0 MODULE.bazel
+9 −13 README.md
+17 −12 WORKSPACE
+35 −0 WORKSPACE.bzlmod
+6 −4 ci/linux-presubmit.sh
+2 −1 ci/macos-presubmit.sh
+8 −3 ci/windows-presubmit.bat
+23 −13 docs/advanced.md
+18 −39 docs/faq.md
+38 −3 docs/gmock_cook_book.md
+4 −2 docs/gmock_for_dummies.md
+19 −20 docs/primer.md
+1 −1 docs/reference/assertions.md
+1 −2 docs/reference/mocking.md
+25 −4 docs/reference/testing.md
+33 −0 fake_fuchsia_sdk.bzl
+14 −13 googlemock/CMakeLists.txt
+3 −3 googlemock/README.md
+34 −10 googlemock/include/gmock/gmock-actions.h
+5 −4 googlemock/include/gmock/gmock-function-mocker.h
+90 −89 googlemock/include/gmock/gmock-matchers.h
+4 −3 googlemock/include/gmock/gmock-more-actions.h
+8 −7 googlemock/include/gmock/gmock.h
+8 −6 googlemock/include/gmock/internal/gmock-internal-utils.h
+4 −4 googlemock/include/gmock/internal/gmock-port.h
+3 −2 googlemock/src/gmock-internal-utils.cc
+14 −15 googlemock/src/gmock-matchers.cc
+2 −1 googlemock/src/gmock-spec-builders.cc
+9 −0 googlemock/test/gmock-matchers-comparisons_test.cc
+14 −3 googlemock/test/gmock-matchers-containers_test.cc
+39 −1 googlemock/test/gmock-more-actions_test.cc
+1 −1 googlemock/test/gmock-spec-builders_test.cc
+9 −0 googlemock/test/gmock_link_test.h
+14 −14 googletest/CMakeLists.txt
+2 −2 googletest/README.md
+4 −0 googletest/cmake/Config.cmake.in
+22 −20 googletest/cmake/internal_utils.cmake
+1 −1 googletest/include/gtest/gtest-assertion-result.h
+4 −4 googletest/include/gtest/gtest-death-test.h
+9 −10 googletest/include/gtest/gtest-message.h
+4 −4 googletest/include/gtest/gtest-param-test.h
+63 −27 googletest/include/gtest/gtest-printers.h
+65 −61 googletest/include/gtest/gtest-typed-test.h
+36 −19 googletest/include/gtest/gtest.h
+25 −26 googletest/include/gtest/internal/gtest-death-test-internal.h
+7 −1 googletest/include/gtest/internal/gtest-filepath.h
+30 −69 googletest/include/gtest/internal/gtest-internal.h
+79 −75 googletest/include/gtest/internal/gtest-param-util.h
+2 −0 googletest/include/gtest/internal/gtest-port-arch.h
+98 −43 googletest/include/gtest/internal/gtest-port.h
+3 −3 googletest/include/gtest/internal/gtest-type-util.h
+19 −17 googletest/src/gtest-death-test.cc
+1 −1 googletest/src/gtest-filepath.cc
+29 −17 googletest/src/gtest-internal-inl.h
+70 −28 googletest/src/gtest-port.cc
+174 −120 googletest/src/gtest.cc
+1 −0 googletest/test/googletest-color-test.py
+41 −37 googletest/test/googletest-death-test-test.cc
+15 −0 googletest/test/googletest-json-output-unittest.py
+4 −1 googletest/test/googletest-options-test.cc
+0 −5 googletest/test/googletest-output-test-golden-lin.txt
+3 −3 googletest/test/googletest-port-test.cc
+16 −0 googletest/test/googletest-printers-test.cc
+52 −44 googletest/test/gtest_environment_test.cc
+23 −41 googletest/test/gtest_help_test.py
+3 −0 googletest/test/gtest_json_test_utils.py
+1 −3 googletest/test/gtest_repeat_test.cc
+19 −27 googletest/test/gtest_unittest.cc
+9 −6 googletest/test/gtest_xml_output_unittest.py
+14 −8 googletest_deps.bzl
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ endif


#------ STANDARDS
# googletest requires c++14 and POSIX API
# googletest requires c++17 and POSIX API
# see https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
#
# cygwin does not enable POSIX API by default
Expand All @@ -239,7 +239,7 @@ endif
# see https://github.com/google/googletest/pull/2839#issue-613300962

set_std := -std=c99
set_std++_tests := -std=c++14
set_std++_tests := -std=c++17


#------ FLAGS
Expand Down
4 changes: 2 additions & 2 deletions src/SW_netCDF.c
Original file line number Diff line number Diff line change
Expand Up @@ -1434,8 +1434,8 @@ static void alloc_netCDF_domain_vars(

double **vars[] = {valsY, valsX};
double **bndsVars[] = {valsYBnds, valsXBnds};
const int numVars = 2;
const int numBnds = 2;
const unsigned int numVars = 2;
const unsigned int numBnds = 2;
unsigned int varNum;
unsigned int bndVarNum;
unsigned int numVals;
Expand Down
2 changes: 1 addition & 1 deletion tools/check_withCompilers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


# Notes:
# - googletests (July 2023) requires a C++14 compliant compilers,
# - googletests (August 2024) requires a C++17 compliant compilers,
# gcc >= 7.3.1 or clang >= 7.0.0,
# and POSIX API (e.g., `_POSIX_C_SOURCE=200809L`)
# which is not enabled by default on all systems
Expand Down
Loading