Windows: Native launcher now works with unicode.

The native launcher can now launch Java and Bash binary in
directory with non-English characters.

Unfortunately, python doesn't support running python zip file under
directory with non-English characters. eg. python ./??/bin.zip will
still fail.

See https://github.com/bazelbuild/bazel/issues/4473

Change-Id: I77fe9cdaabffc2e0d25c7097da5c0c9333a9c4a3
PiperOrigin-RevId: 201939391

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/launcher/util/data_parser_test.cc b/src/tools/launcher/util/data_parser_test.cc
index 1adaf3aebd..be270aa3c3 100644
--- a/src/tools/launcher/util/data_parser_test.cc
+++ b/src/tools/launcher/util/data_parser_test.cc
@@ -18,6 +18,7 @@
 #include <memory>
 #include <vector>
 
+#include "src/main/cpp/util/strings.h"
 #include "src/tools/launcher/util/data_parser.h"
 #include "gtest/gtest.h"
 #include "src/tools/launcher/util/launcher_util.h"
@@ -89,7 +90,8 @@ class LaunchDataParserTest : public ::testing::Test {
   static bool ParseBinaryFile(
       const string& binary_file,
       LaunchDataParser::LaunchInfo* parsed_launch_info) {
-    if (LaunchDataParser::GetLaunchInfo(binary_file, parsed_launch_info)) {
+    if (LaunchDataParser::GetLaunchInfo(
+        blaze_util::CstringToWstring(binary_file), parsed_launch_info)) {
       return true;
     }
     exit(-1);
@@ -100,7 +102,7 @@ class LaunchDataParserTest : public ::testing::Test {
     if (item == parsed_launch_info->end()) {
       return "Cannot find key: " + key;
     }
-    return item->second;
+    return blaze_util::WstringToString(item->second);
   }
 
   string test_tmpdir;