diff options
-rw-r--r-- | test/files/pos/t9097.flags | 1 | ||||
-rw-r--r-- | test/files/pos/t9097.scala | 9 | ||||
-rw-r--r-- | test/files/run/t9097.scala | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/test/files/pos/t9097.flags b/test/files/pos/t9097.flags deleted file mode 100644 index 0f8175b88b..0000000000 --- a/test/files/pos/t9097.flags +++ /dev/null @@ -1 +0,0 @@ --Ydelambdafy:method -Ybackend:GenBCode -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/pos/t9097.scala b/test/files/pos/t9097.scala deleted file mode 100644 index 5e0e921271..0000000000 --- a/test/files/pos/t9097.scala +++ /dev/null @@ -1,9 +0,0 @@ -package o -package a { - class C { - def hihi = List(1,2).map(_ * 2) - } -} -package object a { - def f = 1 -} diff --git a/test/files/run/t9097.scala b/test/files/run/t9097.scala index 0f148c3b9d..d2bf55fc44 100644 --- a/test/files/run/t9097.scala +++ b/test/files/run/t9097.scala @@ -1,9 +1,16 @@ import scala.tools.partest._ import java.io.{Console => _, _} -object Test extends DirectTest { +object Test extends StoreReporterDirectTest { - override def extraSettings: String = "-usejavacp -Ydelambdafy:method -Xprint:delambdafy -d " + testOutput.path + override def extraSettings: String = List( + "-usejavacp", + "-Xfatal-warnings", + "-Ybackend:GenBCode", + "-Ydelambdafy:method", + "-Xprint:delambdafy", + s"-d ${testOutput.path}" + ) mkString " " override def code = """package o |package a { @@ -19,6 +26,7 @@ object Test extends DirectTest { override def show(): Unit = { val baos = new java.io.ByteArrayOutputStream() Console.withOut(baos)(Console.withErr(baos)(compile())) + assert(!storeReporter.hasErrors, message = filteredInfos map (_.msg) mkString "; ") val out = baos.toString("UTF-8") // was 2 before the fix, the two PackageDefs for a would both contain the ClassDef for the closure assert(out.lines.count(_ contains "class hihi$1") == 1, out) |