Merge pull request #5025 from K-S-Manikandan:fix/output-test-python3

PiperOrigin-RevId: 948328634
Change-Id: I9d2c42a63138095b88cc0cff16f69e8220ee1dfd

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 5ab4e11..03392c6 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -187,6 +187,7 @@
         "//conditions:default": [],
     }),
     deps = [":gtest"],
+    alwayslink = True,
 )
 
 # The following rules build samples of how to use gTest.

googletest/include/gtest/internal/gtest-port.h

diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 650a045..8b32dae 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -593,7 +593,8 @@
      defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_GNU_KFREEBSD) || \
      defined(GTEST_OS_OPENBSD) || defined(GTEST_OS_HAIKU) ||          \
      defined(GTEST_OS_GNU_HURD) || defined(GTEST_OS_SOLARIS) ||       \
-     defined(GTEST_OS_AIX) || defined(GTEST_OS_ZOS))
+     defined(GTEST_OS_AIX) || defined(GTEST_OS_ZOS) ||                \
+     (defined(GTEST_OS_EMSCRIPTEN) && defined(__EMSCRIPTEN_PTHREADS__)))
 #define GTEST_HAS_PTHREAD 1
 #else
 #define GTEST_HAS_PTHREAD 0

googletest/test/BUILD.bazel

diff --git a/googletest/test/BUILD.bazel b/googletest/test/BUILD.bazel
index 9575ae1..7561d3c 100644
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
@@ -125,7 +125,7 @@
     name = "googletest-listener-test",
     size = "small",
     srcs = ["googletest-listener-test.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 cc_test(
@@ -358,7 +358,7 @@
     name = "gtest_skip_in_environment_setup_test",
     size = "small",
     srcs = ["gtest_skip_in_environment_setup_test.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 py_test(
@@ -417,7 +417,7 @@
     name = "googletest-catch-exceptions-no-ex-test_",
     testonly = 1,
     srcs = ["googletest-catch-exceptions-test_.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 cc_binary(
@@ -425,7 +425,7 @@
     testonly = 1,
     srcs = ["googletest-catch-exceptions-test_.cc"],
     copts = ["-fexceptions"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 py_test(

googletest/test/googletest-output-test.py

diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py
index 812197b..26f2525 100755
--- a/googletest/test/googletest-output-test.py
+++ b/googletest/test/googletest-output-test.py
@@ -350,6 +350,7 @@
                 '_googletest-output-test_normalized_actual.txt',
             ),
             'w',
+            encoding='utf-8',
         ).write(normalized_actual)
         open(
             os.path.join(
@@ -357,6 +358,7 @@
                 '_googletest-output-test_normalized_golden.txt',
             ),
             'w',
+            encoding='utf-8',
         ).write(normalized_golden)
 
       self.assertEqual(normalized_golden, normalized_actual)