Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

googletest
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

9db942a6

Unverified Commit 9db942a6 authored May 11, 2018 by Scott Graham Committed by GitHub May 11, 2018

Downloads
- Plain Diff

Merge branch 'master' into disabled-rtti

parents a9653c40 08d5b1f3

Branches

No related tags found

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

googletest/include/gtest/gtest-death-test.h 1 addition, 1 deletion

googletest/include/gtest/gtest-death-test.h
googletest/include/gtest/gtest.h 2 additions, 0 deletions

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

googletest/include/gtest/internal/gtest-port.h
googletest/src/gtest-death-test.cc 202 additions, 11 deletions

googletest/src/gtest-death-test.cc
googletest/src/gtest-port.cc 24 additions, 0 deletions

googletest/src/gtest-port.cc
googletest/src/gtest.cc 8 additions, 4 deletions

googletest/src/gtest.cc
googletest/test/gtest-death-test_test.cc 4 additions, 3 deletions

googletest/test/gtest-death-test_test.cc
googletest/test/gtest-options_test.cc 6 additions, 0 deletions

googletest/test/gtest-options_test.cc
googletest/test/gtest-port_test.cc 2 additions, 2 deletions

googletest/test/gtest-port_test.cc
googletest/test/gtest_unittest.cc 22 additions, 0 deletions

googletest/test/gtest_unittest.cc

with 273 additions and 22 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