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

754cb8ed

Unverified Commit 754cb8ed authored 6 years ago by Gennadiy Civil Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into relocatable-pkgconfig-fix

parents 095b3113 864b6c2d

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

ci/env-osx.sh 2 additions, 1 deletion

ci/env-osx.sh
googletest/cmake/internal_utils.cmake 1 addition, 1 deletion

googletest/cmake/internal_utils.cmake
googletest/include/gtest/internal/gtest-port-arch.h 2 additions, 0 deletions

googletest/include/gtest/internal/gtest-port-arch.h
googletest/include/gtest/internal/gtest-port.h 3 additions, 1 deletion

googletest/include/gtest/internal/gtest-port.h
googletest/src/gtest-port.cc 3 additions, 0 deletions

googletest/src/gtest-port.cc
googletest/src/gtest-printers.cc 1 addition, 1 deletion

googletest/src/gtest-printers.cc
googletest/src/gtest.cc 1 addition, 1 deletion

googletest/src/gtest.cc
googletest/test/googletest-filepath-test.cc 1 addition, 1 deletion

googletest/test/googletest-filepath-test.cc
googletest/test/googletest-options-test.cc 6 additions, 0 deletions

googletest/test/googletest-options-test.cc
googletest/test/googletest-param-test-test.cc 1 addition, 37 deletions

googletest/test/googletest-param-test-test.cc
googletest/test/gtest_test_utils.py 2 additions, 1 deletion

googletest/test/gtest_test_utils.py

with 23 additions and 44 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