summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2016-11-10 09:55:59 -0800
committerGitHub <noreply@github.com>2016-11-10 09:55:59 -0800
commitc67066209562e06135b015d6377d0a587f57ad5a (patch)
treebf5fa612fef0707d2b9d69379537f009653062ee /project
parentc39b31cb14a23ba33e669a06cedd4c1be2dc5b60 (diff)
parentacdc8e5ff55c8de5dcf4f2ecb6ae7ea39c6ac5e4 (diff)
downloadscala-c67066209562e06135b015d6377d0a587f57ad5a.tar.gz
scala-c67066209562e06135b015d6377d0a587f57ad5a.tar.bz2
scala-c67066209562e06135b015d6377d0a587f57ad5a.zip
Merge pull request #5432 from dwijnand/partest-scalac_opts
Add support for -Dpartest.scalac_opts to the partest command
Diffstat (limited to 'project')
-rw-r--r--project/PartestUtil.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala
index 99b978515c..897881d2b6 100644
--- a/project/PartestUtil.scala
+++ b/project/PartestUtil.scala
@@ -86,7 +86,10 @@ object PartestUtil {
srcPath = path
opt + " " + path
}
- val P = oneOf(knownUnaryOptions.map(x => token(x))) | SrcPath | TestPathParser | Grep
+
+ val ScalacOptsParser = (token("-Dpartest.scalac_opts=") ~ token(NotSpace)) map { case opt ~ v => opt + v }
+
+ val P = oneOf(knownUnaryOptions.map(x => token(x))) | SrcPath | TestPathParser | Grep | ScalacOptsParser
(Space ~> repsep(P, oneOrMore(Space))).map(_.mkString(" ")).?.map(_.getOrElse("")) <~ OptSpace
}
}