diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-25 14:43:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 14:43:26 (GMT) |
| commit | 40904f897048f26c7af0b199e31f8385c446fcf9 (patch) | |
| tree | 05d8aee6ef8a254b19978c5dada873be633f93f0 | |
| parent | 78b49242d1def8c7fd884b81901f589c7b3d8db2 (diff) | |
| parent | ed1edf641dc5a04dc559df763ca71a5d6d05d939 (diff) | |
| download | googletest-40904f897048f26c7af0b199e31f8385c446fcf9.zip googletest-40904f897048f26c7af0b199e31f8385c446fcf9.tar.gz googletest-40904f897048f26c7af0b199e31f8385c446fcf9.tar.bz2 | |
Merge pull request #1684 from gennadiycivil/master
Formatting changes, code sync
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 3 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-string.h | 3 | ||||
| -rw-r--r-- | googletest/test/gtest_prod_test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index b9fdc45..e4e61f0 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -33,13 +33,12 @@ // threads concurrently. #include "gmock/gmock.h" - #include "gtest/gtest.h" namespace testing { namespace { -// From "gtest/internal/gtest-port.h". +// From gtest-port.h. using ::testing::internal::ThreadWithParam; // The maximum number of test threads (not including helper threads) diff --git a/googletest/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h index 71eb840..64da26c 100644 --- a/googletest/include/gtest/internal/gtest-string.h +++ b/googletest/include/gtest/internal/gtest-string.h @@ -34,8 +34,7 @@ // Google Test. They are subject to change without notice. They should not used // by code external to Google Test. // -// This header file is #included by -// gtest/internal/gtest-internal.h. +// This header file is #included by gtest-internal.h. // It should not be #included by other files. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ 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 39b6841..8ebb667 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) |