1 files changed, 10 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala
index d569ba6b4e..10b12aae29 100644
--- a/src/partest/scala/tools/partest/nest/TestFile.scala
+++ b/src/partest/scala/tools/partest/nest/TestFile.scala
@@ -7,7 +7,7 @@
 
 package scala.tools.partest.nest
 
-import java.io.File
+import java.io.{File, BufferedReader, FileReader}
 import scala.tools.nsc.Settings
 
 class TestFile(kind: String, val file: File, val fileManager: FileManager) {
@@ -24,6 +24,15 @@ class TestFile(kind: String, val file: File, val fileManager: FileManager) {
         outDir.mkdir()
       outDir.toString
     }
+
+    // add additional flags found in 'testname.flags'
+    val flagsFile = new File(dir, fileBase + ".flags")
+    if (flagsFile.exists) {
+      val reader = new BufferedReader(new java.io.FileReader(flagsFile))
+      val flags = reader.readLine
+      if (flags ne null)
+        settings.parseParams(flags, error)
+    }
   }
 
   def defineSettings(settings: Settings) {