summaryrefslogtreecommitdiff
path: root/project/PartestUtil.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-02-11 22:23:50 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-02-11 22:23:50 +1000
commit645506250208eb3fd75ce6ab925692adb068e553 (patch)
tree5c59d33da8de633e4f57c292d8b5ca31986e0c7d /project/PartestUtil.scala
parentfca51b24115ad17a26a144b394a18471ea356155 (diff)
parent39a858de7a65b70ae35ce460e7746cae5e4d3fc4 (diff)
downloadscala-645506250208eb3fd75ce6ab925692adb068e553.tar.gz
scala-645506250208eb3fd75ce6ab925692adb068e553.tar.bz2
scala-645506250208eb3fd75ce6ab925692adb068e553.zip
Merge commit '39a858d' into topic/merge-2.11.x-to-2.12.x-20160210
Diffstat (limited to 'project/PartestUtil.scala')
-rw-r--r--project/PartestUtil.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala
index 0c0c677a6f..4b18c94b47 100644
--- a/project/PartestUtil.scala
+++ b/project/PartestUtil.scala
@@ -87,6 +87,6 @@ object PartestUtil {
opt + " " + path
}
val P = oneOf(knownUnaryOptions.map(x => token(x))) | SrcPath | TestPathParser | Grep
- (Space ~> repsep(P, oneOrMore(Space))).map(_.mkString(" ")).?.map(_.getOrElse(""))
+ (Space ~> repsep(P, oneOrMore(Space))).map(_.mkString(" ")).?.map(_.getOrElse("")) <~ OptSpace
}
}