archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8240970: Some tests fail when run with JCov

Browse source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2020-03-18 14:33:05 -04:00
parent 700f50f287
commit bf54c47471
7 changed files with 83 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

27
test/langtools/tools/javac/modules/RequiresStaticTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,9 @@ import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.stream.Collectors;
import toolbox.JavaTask;
import toolbox.JavacTask;
import toolbox.Task;
@ -257,18 +260,15 @@ public class RequiresStaticTest extends ModuleTestBase {
.run()
.writeAll();
String log = new JavaTask(tb)
List<String> log = new JavaTask(tb)
.vmOptions("--module-path", m3Classes.toString(), "--add-modules", "m3x")
.className("m3x.Test")
.run()
.writeAll()
.getOutput(OutputKind.STDERR);
.getOutputLines(OutputKind.STDERR);
log = log.stream().filter(s->!s.matches("^Picked up .*JAVA.*OPTIONS:.*")).collect(Collectors.toList());
String expected = "ok" + System.getProperty("line.separator");
if (!expected.equals(log)) {
throw new AssertionError("Unexpected output: " + log);
}
tb.checkEqual(log, List.of("ok"));
}
@Test
@ -332,19 +332,16 @@ public class RequiresStaticTest extends ModuleTestBase {
.run()
.writeAll();
String log = new JavaTask(tb)
List<String> log = new JavaTask(tb)
.vmOptions("--module-path", m2Classes.toString() + File.pathSeparator + m3Classes.toString(),
"--add-modules", "m3x")
.className("m3x.Test")
.run()
.writeAll()
.getOutput(OutputKind.STDERR);
.getOutputLines(OutputKind.STDERR);
log = log.stream().filter(s->!s.matches("^Picked up .*JAVA.*OPTIONS:.*")).collect(Collectors.toList());
String expected = "ok" + System.getProperty("line.separator");
if (!expected.equals(log)) {
throw new AssertionError("Unexpected output: " + log);
}
tb.checkEqual(log, List.of("ok"));
}
@Test