.

com-lihaoyi · Dec 14, 2024 · ca3c091 · ca3c091
1 parent 40e41b4
commit ca3c091
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/main/client/src/mill/main/client/ServerLauncher.java b/main/client/src/mill/main/client/ServerLauncher.java
@@ -116,11 +116,6 @@ public Result acquireLocksAndRun(String outDir) throws Exception {
   }
 
   int run(Path serverDir, boolean setJnaNoSys, Locks locks) throws Exception {
-    // Clear out run-related files from the server folder to make sure we
-    // never hit issues where we are reading the files from a previous run
-    Files.deleteIfExists(serverDir.resolve(ServerFiles.exitCode));
-    Files.deleteIfExists(serverDir.resolve(ServerFiles.terminfo));
-    Files.deleteIfExists(serverDir.resolve(ServerFiles.runArgs));
 
     try (OutputStream f = Files.newOutputStream(serverDir.resolve(ServerFiles.runArgs))) {
       f.write(System.console() != null ? 1 : 0);

diff --git a/runner/client/src/mill/runner/client/MillClientMain.java b/runner/client/src/mill/runner/client/MillClientMain.java
@@ -54,7 +54,7 @@ public void initServer(Path serverDir, boolean setJnaNoSys, Locks locks)
               }
 
               public void preRun(Path serverDir) throws Exception {
-                MillProcessLauncher.runTermInfoThread(serverDir);
+                MillProcessLauncher.prepareMillRunFolder(serverDir);
               }
             };
         int exitCode = launcher.acquireLocksAndRun(OutFiles.out).exitCode;

diff --git a/runner/client/src/mill/runner/client/MillProcessLauncher.java b/runner/client/src/mill/runner/client/MillProcessLauncher.java
@@ -33,7 +33,7 @@ static int launchMillNoServer(String[] args) throws Exception {
     boolean interrupted = false;
 
     try {
-      MillProcessLauncher.runTermInfoThread(processDir);
+      MillProcessLauncher.prepareMillRunFolder(processDir);
       Process p = configureRunMillProcess(builder, processDir);
       return p.waitFor();
 
@@ -255,7 +255,13 @@ public static boolean checkTputExists() {
     }
   }
 
-  public static void runTermInfoThread(Path serverDir) throws Exception {
+  public static void prepareMillRunFolder(Path serverDir) throws Exception {
+    // Clear out run-related files from the server folder to make sure we
+    // never hit issues where we are reading the files from a previous run
+    Files.deleteIfExists(serverDir.resolve(ServerFiles.exitCode));
+    Files.deleteIfExists(serverDir.resolve(ServerFiles.terminfo));
+    Files.deleteIfExists(serverDir.resolve(ServerFiles.runArgs));
+
     Path sandbox = serverDir.resolve(ServerFiles.sandbox);
     Files.createDirectories(sandbox);
     boolean tputExists = checkTputExists();