CommandBuilder.java: Don't quote the last argument when passing Wind…

…ows command to CMD.EXE.

    Fix bazelbuild/bazel#2040 (comment)

    RELNOTES: None
    PiperOrigin-RevId: 165562681

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/util/CommandBuilder.java

@@ -141,12 +141,10 @@ private String[] transformArgvForWindows() {
       // args can contain whitespace, so figure out the first word
       String argv0 = modifiedArgv.get(0);
       String command = ARGV_SPLITTER.split(argv0).iterator().next();
-
+      
       // Automatically enable CMD.EXE use if we are executing something else besides "*.exe" file.
-      // When use CMD.EXE to invoke a bat/cmd file, the file path must have '\' instead of '/'
       if (!command.toLowerCase().endsWith(".exe")) {
         useShell = true;
-        modifiedArgv.set(0, argv0.replace('/', '\\'));
       }
     } else {
       // This is degenerate "/bin/sh -c" case. We ensure that Windows behavior is identical

dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/util/CommandBuilderTest.java

@@ -52,7 +52,7 @@ private void assertFailure(CommandBuilder builder, String expected) {
       builder.build();
       fail("Expected exception");
     } catch (Exception e) {
-      assertThat(e).hasMessageThat().isEqualTo(expected);
+      assertThat(e).hasMessage(expected);
     }
   }