summaryrefslogtreecommitdiff
path: root/test/scaladoc/filters
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-07-23 13:42:53 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-07-23 13:47:56 +0200
commit0b35bc29aa94b0b7ec280d01ffd55101ac18817a (patch)
treecbff013c53f1bb6ec7bef53c6fc1e9cd6947c6a6 /test/scaladoc/filters
parent0e9525aa618a2eca143a1c7379ff1e6efd23b86e (diff)
downloadscala-0b35bc29aa94b0b7ec280d01ffd55101ac18817a.tar.gz
scala-0b35bc29aa94b0b7ec280d01ffd55101ac18817a.tar.bz2
scala-0b35bc29aa94b0b7ec280d01ffd55101ac18817a.zip
Ignore OpenJDK warnings in partest filters
When running a 2.11.x validation on JDK 8, there are OpenJDK warnings that fail tests. Backports a part of 8d2d3c70 to 2.11.x. The missing filter causes merge commits to fail in PRs that merge 2.11 to 2.12, e.g., https://github.com/scala/scala/pull/4655. In the future we probably want to trigger an integration build for merge commits, but this doesn't happen yet AFAICT.
Diffstat (limited to 'test/scaladoc/filters')
-rw-r--r--test/scaladoc/filters1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/scaladoc/filters b/test/scaladoc/filters
index 51a7507848..e91ca0eb36 100644
--- a/test/scaladoc/filters
+++ b/test/scaladoc/filters
@@ -1,6 +1,7 @@
#
#Java HotSpot(TM) 64-Bit Server VM warning: Failed to reserve shared memory (errno = 28).
Java HotSpot\(TM\) .* warning:
+OpenJDK .* warning:
# Hotspot receiving VM options through the $_JAVA_OPTIONS
# env variable outputs them on stderr
Picked up _JAVA_OPTIONS: