Skip to content

Commit 4c8a2bd

Browse files
Merge pull request #4239 from dotty-staging/fix-#4143
Fix #4143: Ignore lines "Picked up _JAVA_OPTIONS" in tests
2 parents 7d01268 + ffa2a74 commit 4c8a2bd

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

compiler/test/dotty/tools/vulpix/ChildJVMMain.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.lang.reflect.Method;
1010

1111
public class ChildJVMMain {
12+
static final String MessageStart = "##THIS IS THE START FOR ME, HELLO##";
1213
static final String MessageEnd = "##THIS IS THE END FOR ME, GOODBYE##";
1314

1415
private static void runMain(String dir) throws Exception {
@@ -23,6 +24,9 @@ private static void runMain(String dir) throws Exception {
2324
Class<?> cls = ucl.loadClass("Test");
2425
Method meth = cls.getMethod("main", String[].class);
2526
Object[] args = new Object[]{ new String[]{ "jvm" } };
27+
28+
System.out.println(MessageStart);
29+
2630
meth.invoke(null, args);
2731
}
2832

compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,13 @@ trait RunnerOrchestration {
118118
if (childStdout eq null)
119119
childStdout = new BufferedReader(new InputStreamReader(process.getInputStream))
120120

121-
var childOutput = childStdout.readLine()
121+
var childOutput: String = childStdout.readLine()
122+
123+
// Discard all messages until the test starts
124+
while (childOutput != ChildJVMMain.MessageStart && childOutput != null)
125+
childOutput = childStdout.readLine()
126+
childOutput = childStdout.readLine()
127+
122128
while (childOutput != ChildJVMMain.MessageEnd && childOutput != null) {
123129
sb.append(childOutput)
124130
sb += '\n'

0 commit comments

Comments
 (0)