Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

1cd979a8 · Tanzinul Islam · 32800999 · e5e2ef7c · 1cd979a8 · 1cd979a8
Commit 1cd979a8 authored Aug 01, 2018 by Tanzinul Islam
20 changed files
--- a/googletest/include/gtest/internal/gtest-tuple.h.pump
+++ b/googletest/include/gtest/internal/gtest-tuple.h.pump
@@ -34,6 +34,8 @@ $$ This meta comment fixes auto-indentation in Emacs. }}

 // Implements a subset of TR1 tuple needed by Google Test and Google Mock.

+// GOOGLETEST_CM0001 DO NOT DELETE
+
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_


--- a/googletest/include/gtest/internal/gtest-type-util.h
+++ b/googletest/include/gtest/internal/gtest-type-util.h
--- a/googletest/include/gtest/internal/gtest-type-util.h.pump
+++ b/googletest/include/gtest/internal/gtest-type-util.h.pump
--- a/googletest/scripts/fuse_gtest_files.py
+++ b/googletest/scripts/fuse_gtest_files.py
--- a/googletest/scripts/upload.py
+++ b/googletest/scripts/upload.py
--- a/googletest/src/gtest-all.cc
+++ b/googletest/src/gtest-all.cc
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
--- a/googletest/src/gtest-test-part.cc
+++ b/googletest/src/gtest-test-part.cc
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
--- 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-death-test_test.cc
+++ b/googletest/test/gtest-death-test_test.cc
--- a/googletest/test/gtest-listener_test.cc
+++ b/googletest/test/gtest-listener_test.cc
--- a/googletest/test/gtest-param-test_test.h
+++ b/googletest/test/gtest-param-test_test.h
--- a/googletest/test/gtest-printers_test.cc
+++ b/googletest/test/gtest-printers_test.cc
--- a/googletest/test/gtest-unittest-api_test.cc
+++ b/googletest/test/gtest-unittest-api_test.cc
--- a/googletest/test/gtest_all_test.cc
+++ b/googletest/test/gtest_all_test.cc