Fix test and unflip

bazelbuild · Jan 31, 2025 · 7bb7210 · 7bb7210
1 parent 96706de
commit 7bb7210
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
@@ -577,7 +577,7 @@ public Converter() {
 
   @Option(
       name = "file_write_strategy",
-      defaultValue = "lazy",
+      defaultValue = "eager",
       converter = FileWriteStrategy.Converter.class,
       documentationCategory = OptionDocumentationCategory.REMOTE,
       effectTags = {OptionEffectTag.EXECUTION},

diff --git a/...st/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTestBase.java b/...st/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTestBase.java
@@ -1118,12 +1118,18 @@ public void downloadMinimal_fileWrite(
             srcs = [':foo'],
             outs = ['out/gen.txt'],
             cmd = \"""
-            [ -x $(location :foo) ] || { echo "unexpectedly not executable"; exit 1; }
+            %s
             cat $(location :foo) $(location :foo) > $@
             \""",
         )
         """
-            .formatted(isExecutable ? "True" : "False"));
+            .formatted(
+                isExecutable ? "True" : "False",
+                OS.getCurrent() == OS.WINDOWS
+                    ? ""
+                    : """
+                      [ -x $(location :foo) ] || { echo "unexpectedly not executable"; exit 1; }
+                      """));
 
     addOptions("--file_write_strategy=" + fileWriteStrategy);