summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-02-19 10:17:59 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-02-19 10:17:59 -0800
commit2b90b890b82ea2771b7a6507424ef8494046a853 (patch)
treee18b65bc1abcfc0c3ce8f5a1f5d5f6fd2f9c16d7
parent9b9bd64e8c34a0f3b7d3c61bfb12fe5be6a6260e (diff)
parent808eca6ec1003c371c07f08bf7f9a4a56af7c965 (diff)
downloadscala-2b90b890b82ea2771b7a6507424ef8494046a853.tar.gz
scala-2b90b890b82ea2771b7a6507424ef8494046a853.tar.bz2
scala-2b90b890b82ea2771b7a6507424ef8494046a853.zip
Merge pull request #4345 from retronym/topic/scaladoc-test-java8
Fix the Scaladoc tests under Java 8
-rw-r--r--test/scaladoc/filters8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/scaladoc/filters b/test/scaladoc/filters
new file mode 100644
index 0000000000..51a7507848
--- /dev/null
+++ b/test/scaladoc/filters
@@ -0,0 +1,8 @@
+#
+#Java HotSpot(TM) 64-Bit Server VM warning: Failed to reserve shared memory (errno = 28).
+Java HotSpot\(TM\) .* warning:
+# Hotspot receiving VM options through the $_JAVA_OPTIONS
+# env variable outputs them on stderr
+Picked up _JAVA_OPTIONS:
+# Filter out a message caused by this bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8021205
+objc\[\d+\]: Class JavaLaunchHelper is implemented in both .* and .*\. One of the two will be used\. Which one is undefined\.