Enable UTF Output for new test framework discoveryy and execution to …

…fix GB18030 bug
microsoft · Aug 8, 2024 · 077895c · 077895c
1 parent 00f4232
commit 077895c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/GoogleTestAdapter/Core/GoogleTestConstants.cs b/GoogleTestAdapter/Core/GoogleTestConstants.cs
@@ -18,6 +18,7 @@ public static class GoogleTestConstants
         public const string NrOfRepetitionsOption = " --gtest_repeat";
         public const string CatchExceptions = " --gtest_catch_exceptions";
         public const string BreakOnFailure = " --gtest_break_on_failure";
+        public const string Utf8OutputOption = " --gtest_print_utf8=1";
 
         public const int ShuffleTestsSeedDefaultValue = 0;
         public const string ShuffleTestsSeedMaxValueAsString = "99999";

diff --git a/GoogleTestAdapter/Core/Runners/CommandLineGenerator.cs b/GoogleTestAdapter/Core/Runners/CommandLineGenerator.cs
@@ -15,7 +15,7 @@ public class CommandLineGenerator
         public class Args
         {
             public IList<TestCase> TestCases { get; }
-            public string CommandLine { get; }
+            public string CommandLine { get; set; }
 
             internal Args(IList<TestCase> testCases, string commandLine)
             {

diff --git a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs
@@ -141,6 +141,10 @@ private void RunTestsFromExecutable(string executable, string workingDir, IDicti
                 {
                     break;
                 }
+
+                // Enable UTF-8 output for Google Test.
+                arguments.CommandLine += " --gtest_print_utf8=1";
+
                 var streamingParser = new StreamingStandardOutputTestResultParser(arguments.TestCases, _logger, _frameworkReporter);
                 var results = RunTests(executable, workingDir, envVars, isBeingDebugged, debuggedLauncher, arguments, executor, streamingParser).ToArray();
 

diff --git a/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs b/GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs
@@ -135,7 +135,7 @@ private IList<TestCase> NewCreateTestcases(Action<TestCase> reportTestCase, List
                 parser.ReportLine(s);
             };
 
-            string cmdLine = GoogleTestConstants.ListTestsOption;
+            string cmdLine = GoogleTestConstants.ListTestsOption + GoogleTestConstants.Utf8OutputOption;
             if (!string.IsNullOrEmpty(_settings.AdditionalTestDiscoveryParam))
             {
                 cmdLine = string.Format("{0} {1}", _settings.AdditionalTestDiscoveryParam, cmdLine);