summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-04 18:13:52 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-04 18:13:52 +1000
commit9753f23f9362b25a9f481b11dd8d51187187882a (patch)
tree4e7bb01e59f26c2a6c035208102a2b984c278da9 /test
parenta66f5df2bc7b56814bbd6f767a5bea198588d863 (diff)
parente9a6fbb42f5214995d63dfee476c44b0564a0856 (diff)
downloadscala-9753f23f9362b25a9f481b11dd8d51187187882a.tar.gz
scala-9753f23f9362b25a9f481b11dd8d51187187882a.tar.bz2
scala-9753f23f9362b25a9f481b11dd8d51187187882a.zip
Merge pull request #3961 from lrytz/t8786-disable-test
SI-8786 disable part of thest that's failing the jdk8 build
Diffstat (limited to 'test')
-rw-r--r--test/files/jvm/varargs/VaClass.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/files/jvm/varargs/VaClass.scala b/test/files/jvm/varargs/VaClass.scala
index e94e8a625a..d83e63ace1 100644
--- a/test/files/jvm/varargs/VaClass.scala
+++ b/test/files/jvm/varargs/VaClass.scala
@@ -9,5 +9,7 @@ class VaClass {
@varargs def vs(a: Int, b: String*) = println(a + b.length)
@varargs def vi(a: Int, b: Int*) = println(a + b.sum)
@varargs def vt[T](a: Int, b: T*) = println(a + b.length)
- @varargs def vt1[T](a: Int, b: T*): T = b.head
+
+ // TODO remove type bound after fixing SI-8786, see also https://github.com/scala/scala/pull/3961
+ @varargs def vt1[T <: String](a: Int, b: T*): T = b.head
}