Merge branch 'master' into patch-1

7e7e3a6f · Gennadiy Civil · GitHub · b50b2f77 · 997d343d · 7e7e3a6f
Unverified Commit 7e7e3a6f authored Aug 15, 2018 by Gennadiy Civil Committed by GitHub Aug 15, 2018
20 changed files
--- 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
--- a/googletest/test/gtest-listener_test.cc
+++ b/googletest/test/gtest-listener_test.cc
--- a/googletest/test/gtest-message_test.cc
+++ b/googletest/test/gtest-message_test.cc
--- a/googletest/test/gtest-options_test.cc
+++ b/googletest/test/gtest-options_test.cc
--- a/googletest/test/gtest_output_test_golden_lin.txt
+++ b/googletest/test/gtest_output_test_golden_lin.txt
--- a/googletest/test/gtest_output_test.py
+++ b/googletest/test/gtest_output_test.py
--- a/googletest/test/gtest_output_test_.cc
+++ b/googletest/test/gtest_output_test_.cc
--- a/googletest/test/googletest-param-test-invalid-name1-test.py
+++ b/googletest/test/googletest-param-test-invalid-name1-test.py
--- a/googletest/test/googletest-param-test-invalid-name1-test_.cc
+++ b/googletest/test/googletest-param-test-invalid-name1-test_.cc
--- a/googletest/test/googletest-param-test-invalid-name2-test.py
+++ b/googletest/test/googletest-param-test-invalid-name2-test.py
--- a/googletest/test/googletest-param-test-invalid-name2-test_.cc
+++ b/googletest/test/googletest-param-test-invalid-name2-test_.cc
--- a/googletest/test/gtest-param-test_test.cc
+++ b/googletest/test/gtest-param-test_test.cc
--- a/googletest/test/gtest-param-test_test.h
+++ b/googletest/test/gtest-param-test_test.h
--- a/googletest/test/gtest-param-test2_test.cc
+++ b/googletest/test/gtest-param-test2_test.cc