diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-13 14:51:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 14:51:34 -0500 |
| commit | 38611c51215257df7cb533fdf983efbb95483afa (patch) | |
| tree | a23fe58443272d4fdaf78fd3870af2e3de315cb6 | |
| parent | 462ef92f75fd3693f0c285d3f2d1091d3557485a (diff) | |
| parent | 069724197c03e56c0197b80ace8b97187d27c45d (diff) | |
| download | googletest-38611c51215257df7cb533fdf983efbb95483afa.tar.gz googletest-38611c51215257df7cb533fdf983efbb95483afa.tar.bz2 googletest-38611c51215257df7cb533fdf983efbb95483afa.zip | |
Merge pull request #1457 from gennadiycivil/master
merging, cleaning up
| -rw-r--r-- | googletest/test/gtest_all_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/googletest/test/gtest_all_test.cc b/googletest/test/gtest_all_test.cc index 955aa628..e16ef539 100644 --- a/googletest/test/gtest_all_test.cc +++ b/googletest/test/gtest_all_test.cc @@ -33,15 +33,15 @@ // // Sometimes it's desirable to build most of Google Test's own tests // by compiling a single file. This file serves this purpose. -#include "test/gtest-filepath_test.cc" -#include "test/gtest-linked_ptr_test.cc" -#include "test/gtest-message_test.cc" -#include "test/gtest-options_test.cc" -#include "test/gtest-port_test.cc" -#include "test/gtest_pred_impl_unittest.cc" -#include "test/gtest_prod_test.cc" -#include "test/gtest-test-part_test.cc" -#include "test/gtest-typed-test_test.cc" -#include "test/gtest-typed-test2_test.cc" -#include "test/gtest_unittest.cc" -#include "test/production.cc" +#include "gtest-filepath_test.cc" +#include "gtest-linked_ptr_test.cc" +#include "gtest-message_test.cc" +#include "gtest-options_test.cc" +#include "gtest-port_test.cc" +#include "gtest_pred_impl_unittest.cc" +#include "gtest_prod_test.cc" +#include "gtest-test-part_test.cc" +#include "gtest-typed-test_test.cc" +#include "gtest-typed-test2_test.cc" +#include "gtest_unittest.cc" +#include "production.cc" |