summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2017-02-16 13:50:52 -0800
committerGitHub <noreply@github.com>2017-02-16 13:50:52 -0800
commitc8e550420a1fd9bd5958671bbaed2bfadc88ba60 (patch)
tree2da3345d1826908750420ea3f420f802f82d5f2e /project
parent98a7d4ce0234dc1c4b080ecaeed9ced09d39578a (diff)
parentf207ffc42927f3aae1543ba476b8c48ff4e1b7b4 (diff)
downloadscala-c8e550420a1fd9bd5958671bbaed2bfadc88ba60.tar.gz
scala-c8e550420a1fd9bd5958671bbaed2bfadc88ba60.tar.bz2
scala-c8e550420a1fd9bd5958671bbaed2bfadc88ba60.zip
Merge pull request #5684 from SethTisue/partest-sbt-only-plz
run partest from sbt always, command line never
Diffstat (limited to 'project')
-rw-r--r--project/PartestUtil.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala
index ab7e62b3b4..23570a88ec 100644
--- a/project/PartestUtil.scala
+++ b/project/PartestUtil.scala
@@ -90,6 +90,6 @@ object PartestUtil {
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
+ (Space ~> repsep(P, oneOrMore(Space))).map(_.mkString(" ")).?.map(_.getOrElse(""))
}
}