summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-07-24 18:32:15 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-07-24 18:32:15 +0200
commit4c6dcfe9341d2db47a0b0a567f5646fb9d573020 (patch)
treeacdc37637a9605395a198331db5a32f40039542b
parent6eb0812050abb18b5938a8c2a6f066d3cd5d54b7 (diff)
parent0b35bc29aa94b0b7ec280d01ffd55101ac18817a (diff)
downloadscala-4c6dcfe9341d2db47a0b0a567f5646fb9d573020.tar.gz
scala-4c6dcfe9341d2db47a0b0a567f5646fb9d573020.tar.bz2
scala-4c6dcfe9341d2db47a0b0a567f5646fb9d573020.zip
Merge pull request #4656 from lrytz/filtersOpenJDK
Ignore OpenJDK warnings in partest filters
-rw-r--r--test/files/filters1
-rw-r--r--test/scaladoc/filters1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/files/filters b/test/files/filters
index 51a7507848..e91ca0eb36 100644
--- a/test/files/filters
+++ b/test/files/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:
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: