diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-26 17:04:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 17:04:53 (GMT) |
| commit | 6cacb41935a38069d85971c9193d4b7cca2681a3 (patch) | |
| tree | 00e5db2f87f90b9743c23b35af9278476ce08ed7 /googletest/test | |
| parent | fd4f7cc7299e8fde91d45ba6685fbd99698814e0 (diff) | |
| parent | 40904f897048f26c7af0b199e31f8385c446fcf9 (diff) | |
| download | googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.zip googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.gz googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.bz2 | |
Merge branch 'master' into deprecate
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest_prod_test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googletest/test/gtest_prod_test.cc b/googletest/test/gtest_prod_test.cc index dfb9998..c5cceab 100644 --- a/googletest/test/gtest_prod_test.cc +++ b/googletest/test/gtest_prod_test.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// Unit test for gtest/gtest_prod.h. +// Unit test for gtest_prod.h. #include "production.h" #include "gtest/gtest.h" diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index ab22031..c5987ae 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -35,8 +35,8 @@ #include "gtest/gtest.h" // Verifies that the command line flag variables can be accessed in -// code once "gtest/gtest.h" has been -// #included. Do not move it after other gtest #includes. +// code once "gtest.h" has been #included. +// Do not move it after other gtest #includes. TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { bool dummy = testing::GTEST_FLAG(also_run_disabled_tests) || testing::GTEST_FLAG(break_on_failure) |