Merge branch 'master' into cleanup-cmake

1246e580 · Gennadiy Civil · GitHub · 4b6a7a49 · 2172c08c · 1246e580
Unverified Commit 1246e580 authored Aug 15, 2018 by Gennadiy Civil Committed by GitHub Aug 15, 2018
20 changed files
--- a/googletest/src/gtest_main.cc
+++ b/googletest/src/gtest_main.cc
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
--- a/googletest/test/gtest_break_on_failure_unittest.py
+++ b/googletest/test/gtest_break_on_failure_unittest.py
--- a/googletest/test/gtest_break_on_failure_unittest_.cc
+++ b/googletest/test/gtest_break_on_failure_unittest_.cc
--- a/googletest/test/gtest_catch_exceptions_test.py
+++ b/googletest/test/gtest_catch_exceptions_test.py
--- a/googletest/test/gtest_catch_exceptions_test_.cc
+++ b/googletest/test/gtest_catch_exceptions_test_.cc
--- a/googletest/test/gtest_color_test.py
+++ b/googletest/test/gtest_color_test.py
--- a/googletest/test/gtest_color_test_.cc
+++ b/googletest/test/gtest_color_test_.cc
--- a/googletest/test/gtest-death-test_test.cc
+++ b/googletest/test/gtest-death-test_test.cc
--- a/googletest/test/gtest-death-test_ex_test.cc
+++ b/googletest/test/gtest-death-test_ex_test.cc
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
--- a/googletest/test/gtest_env_var_test_.cc
+++ b/googletest/test/gtest_env_var_test_.cc
--- a/googletest/test/gtest-filepath_test.cc
+++ b/googletest/test/gtest-filepath_test.cc
--- a/googletest/test/gtest_filter_unittest.py
+++ b/googletest/test/gtest_filter_unittest.py
--- a/googletest/test/gtest_filter_unittest_.cc
+++ b/googletest/test/gtest_filter_unittest_.cc
--- a/googletest/test/gtest_json_outfiles_test.py
+++ b/googletest/test/gtest_json_outfiles_test.py
--- a/googletest/test/gtest_json_output_unittest.py
+++ b/googletest/test/gtest_json_output_unittest.py
--- a/googletest/test/gtest-linked_ptr_test.cc
+++ b/googletest/test/gtest-linked_ptr_test.cc
--- a/googletest/test/gtest_list_tests_unittest.py
+++ b/googletest/test/gtest_list_tests_unittest.py
--- a/googletest/test/gtest_list_tests_unittest_.cc
+++ b/googletest/test/gtest_list_tests_unittest_.cc