File tree 3 files changed +12
-2
lines changed
compiler/test/dotty/tools/vulpix 3 files changed +12
-2
lines changed Original file line number Diff line number Diff line change 9
9
import java .lang .reflect .Method ;
10
10
11
11
public class ChildJVMMain {
12
+ static final String MessageStart = "##THIS IS THE START FOR ME, HELLO##" ;
12
13
static final String MessageEnd = "##THIS IS THE END FOR ME, GOODBYE##" ;
13
14
14
15
private static void runMain (String dir ) throws Exception {
@@ -23,6 +24,9 @@ private static void runMain(String dir) throws Exception {
23
24
Class <?> cls = ucl .loadClass ("Test" );
24
25
Method meth = cls .getMethod ("main" , String [].class );
25
26
Object [] args = new Object []{ new String []{ "jvm" } };
27
+
28
+ System .out .println (MessageStart );
29
+
26
30
meth .invoke (null , args );
27
31
}
28
32
Original file line number Diff line number Diff line change @@ -600,7 +600,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
600
600
else runMain(testSource.runClassPath) match {
601
601
case Success (_) if ! checkFile.isDefined || ! checkFile.get.exists => // success!
602
602
case Success (output) => {
603
- val outputLines = output.lines.filterNot(_.startsWith( " Picked up _JAVA_OPTIONS " )). toArray :+ DiffUtil .EOF
603
+ val outputLines = output.lines.toArray :+ DiffUtil .EOF
604
604
val checkLines : Array [String ] = Source .fromFile(checkFile.get).getLines().toArray :+ DiffUtil .EOF
605
605
val sourceTitle = testSource.title
606
606
Original file line number Diff line number Diff line change @@ -118,7 +118,13 @@ trait RunnerOrchestration {
118
118
if (childStdout eq null )
119
119
childStdout = new BufferedReader (new InputStreamReader (process.getInputStream))
120
120
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
+
122
128
while (childOutput != ChildJVMMain .MessageEnd && childOutput != null ) {
123
129
sb.append(childOutput)
124
130
sb += '\n '
You can’t perform that action at this time.
0 commit comments