Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Googletest
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

1489dc8d

Unverified Commit 1489dc8d authored 7 years ago by Gennadiy Civil Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'master' into support_xboxone

parents ea8f6f0e 05105305

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

googlemock/CMakeLists.txt 40 additions, 23 deletions

googlemock/CMakeLists.txt
googletest/docs/AdvancedGuide.md 9 additions, 7 deletions

googletest/docs/AdvancedGuide.md
googletest/include/gtest/gtest.h 72 additions, 18 deletions

googletest/include/gtest/gtest.h
googletest/include/gtest/gtest_pred_impl.h 6 additions, 7 deletions

googletest/include/gtest/gtest_pred_impl.h
googletest/include/gtest/internal/gtest-internal.h 4 additions, 47 deletions

googletest/include/gtest/internal/gtest-internal.h
googletest/src/gtest.cc 19 additions, 20 deletions

googletest/src/gtest.cc
googletest/test/BUILD.bazel 243 additions, 1 deletion

googletest/test/BUILD.bazel
googletest/test/gtest_output_test.py 2 additions, 1 deletion

googletest/test/gtest_output_test.py
googletest/test/gtest_output_test_.cc 7 additions, 0 deletions

googletest/test/gtest_output_test_.cc
googletest/test/gtest_output_test_golden_lin.txt 13 additions, 4 deletions

googletest/test/gtest_output_test_golden_lin.txt

with 415 additions and 128 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment