Skip to content

Commit 46e2161

Browse files
authored
Fix hang on mill.integration.invalidation[selective-execution] (#4571)
Should fix the rebootstrap problems found in #4545 and #4570 that seems to be caused by a mistake in this backport #4504. Not sure why this causes a hang, but for now just fixing it to revert to the previous semantics Tested manually via ```bash ./mill dist.installLocal git checkout main ./mill-assembly.jar 'integration.invalidation[selective-execution].local.fork.test' mill.integration.SelectiveExecutionWatchTests.watch.changed-code ``` Doing this manually on `0.12.x` hangs, whereas doing it on this PR succeeds
1 parent 74258ec commit 46e2161

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

scalalib/src/mill/scalalib/TestModuleUtil.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ private[scalalib] object TestModuleUtil {
7070
env = forkEnv ++ resourceEnv,
7171
mainArgs = Seq(testRunnerClasspathArg, argsFile.toString),
7272
cwd = if (testSandboxWorkingDir) sandbox else forkWorkingDir,
73-
cpPassingJarPath = Some(os.temp(prefix = "run-", suffix = ".jar", deleteOnExit = false)),
73+
cpPassingJarPath = Option.when(useArgsFile)(
74+
os.temp(prefix = "run-", suffix = ".jar", deleteOnExit = false)
75+
),
7476
javaHome = javaHome,
7577
stdin = os.Inherit,
7678
stdout = os.Inherit

0 commit comments

Comments
 (0)