Launcher exports RUNFILES paths with fwd slashes

bazelbuild · Mar 28, 2019 · d2649fa · d2649fa
1 parent 797bacc
commit d2649fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/test/py/bazel/launcher_test.py b/src/test/py/bazel/launcher_test.py
@@ -48,7 +48,7 @@ def _buildJavaTargets(self, bazel_bin, binary_suffix):
     self.assertEqual(stdout[0], 'hello java')
     if self.IsWindows():
       self.assertRegexpMatches(
-          stdout[1], r'java_runfiles=.*foo\\foo%s.runfiles' % binary_suffix)
+          stdout[1], r'java_runfiles=.*foo/foo%s.runfiles' % binary_suffix)
       self.assertEqual(stdout[2], 'runfiles_manifest_only=1')
       self.assertRegexpMatches(
           stdout[3], r'^runfiles_manifest_file=[a-zA-Z]:[/\\].*MANIFEST$')

diff --git a/src/tools/launcher/launcher.cc b/src/tools/launcher/launcher.cc
@@ -187,9 +187,11 @@ ExitCode BinaryLauncherBase::LaunchProcess(const wstring& executable,
     if (!manifest_exists && i.first == "RUNFILES_MANIFEST_FILE") {
       manifest_exists = true;
     }
+    string winpath = i.second;
+    std::replace(winpath.begin(), winpath.end(), '\\', '/');
     SetEnv(
         blaze_util::CstringToWstring(i.first.c_str()).get(),
-        blaze_util::CstringToWstring(i.second.c_str()).get());
+        blaze_util::CstringToWstring(winpath.c_str()).get());
   }
   // As of 2019-03-27 the list doesn't contain RUNFILES_MANIFEST_ONLY, so we set
   // it manually.