Merge branch 'master' into isnice

8c82ba48 · BrukerJWD · GitHub · 6bbf911a · a651a4d4 · 8c82ba48
Unverified Commit 8c82ba48 authored Oct 16, 2018 by BrukerJWD Committed by GitHub Oct 16, 2018
20 changed files
--- 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/googletest-json-outfiles-test.py
+++ b/googletest/test/googletest-json-outfiles-test.py
--- a/googletest/test/googletest-json-output-unittest.py
+++ b/googletest/test/googletest-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