summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-02-13 19:13:52 (GMT)
committerGennadiy Civil <misterg@google.com>2018-02-13 19:13:52 (GMT)
commit069724197c03e56c0197b80ace8b97187d27c45d (patch)
treea23fe58443272d4fdaf78fd3870af2e3de315cb6 /googletest
parent462ef92f75fd3693f0c285d3f2d1091d3557485a (diff)
downloadgoogletest-069724197c03e56c0197b80ace8b97187d27c45d.zip
googletest-069724197c03e56c0197b80ace8b97187d27c45d.tar.gz
googletest-069724197c03e56c0197b80ace8b97187d27c45d.tar.bz2
merging, cleaning uprefs/pull/1457/head
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest_all_test.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/googletest/test/gtest_all_test.cc b/googletest/test/gtest_all_test.cc
index 955aa62..e16ef53 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"