Merge pull request scala#6705 from hrhino/topic/partest-scalac

Runner reads scalac args from file.

Author: lrytz

src/partest/scala/tools/partest/nest/Runner.scala

@@ -512,7 +512,8 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
     val perGroup = if (testFile.isDirectory) {
       sources.flatMap(f => readOptionsFile(f changeExtension "flags"))
     } else Nil
-    perTest ++ perGroup
+    val perFile  = toolArgsFor(sources)("scalac")
+    perTest ++ perGroup ++ perFile
   }
 
   // inspect sources for tool args
@@ -532,7 +533,9 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
           case s if (p findFirstIn s).nonEmpty => for (m <- p findFirstMatchIn s) yield m group "args"
         }
       } finally src.close()
-      args.flatten map argsplitter getOrElse Nil
+      val parsed = args.flatten map argsplitter getOrElse Nil
+      // be forgiving of /* scalac: ... */
+      if (parsed.lastOption contains "*/") parsed.init else parsed
     }
     files flatMap argsFor
   }

test/files/jvm/beanInfo.check

@@ -1,13 +1,13 @@
-check-dead.scala:7: warning: dead code following this construct
+check-dead.scala:8: warning: dead code following this construct
   def z1 = y1(throw new Exception)  // should warn
               ^
-check-dead.scala:10: warning: dead code following this construct
+check-dead.scala:11: warning: dead code following this construct
   def z2 = y2(throw new Exception)  // should warn
               ^
-check-dead.scala:29: warning: dead code following this construct
+check-dead.scala:30: warning: dead code following this construct
     throw new Exception // should warn
     ^
-check-dead.scala:33: warning: dead code following this construct
+check-dead.scala:34: warning: dead code following this construct
     throw new Exception // should warn
     ^
 error: No warnings can be incurred under -Xfatal-warnings.

test/files/jvm/xml05.check

@@ -1,3 +1,4 @@
+/* scalac: -Ywarn-dead-code -Xfatal-warnings */
 object Other {
   def oops(msg: String = "xxx"): Nothing = throw new Exception(msg) // should not warn
 }

test/files/neg/check-dead.check

@@ -1,3 +1,4 @@
+/* scalac: -language:experimental.macros */
 import scala.reflect.macros.blackbox.Context
 import java.io.InputStream