diff options
| author | Paul Phillips <paulp@improving.org> | 2013-04-24 09:20:20 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-04-24 09:20:20 -0700 |
| commit | 9cc97f4573f63d9a28a2bd7fd97cf1fe04719574 (patch) | |
| tree | 31e980c01fd98927badee2eb77199655ba1fe1a2 | |
| parent | 5ec9dbd6a983778b3765d2da36b208081896ad8e (diff) | |
| parent | 4c715eb0aad082404e037de45f4a83227fcc1ebc (diff) | |
| download | scala-9cc97f4573f63d9a28a2bd7fd97cf1fe04719574.tar.gz scala-9cc97f4573f63d9a28a2bd7fd97cf1fe04719574.tar.bz2 scala-9cc97f4573f63d9a28a2bd7fd97cf1fe04719574.zip | |
Merge pull request #2431 from som-snytt/issue/partest-srcdir
Par-Test allows redefinition of srcDir by Ant
| -rw-r--r-- | src/partest/scala/tools/partest/nest/PathSettings.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala index b1f868c9d2..bae6bf819d 100644 --- a/src/partest/scala/tools/partest/nest/PathSettings.scala +++ b/src/partest/scala/tools/partest/nest/PathSettings.scala @@ -27,8 +27,8 @@ object PathSettings { candidates find isPartestDir getOrElse sys.error("Directory 'test' not found.") } - // Directory <root>/test/files - lazy val srcDir = Directory(testRoot / srcDirName toCanonical) + // Directory <root>/test/files or .../scaladoc + def srcDir = Directory(testRoot / srcDirName toCanonical) // Directory <root>/test/files/lib lazy val srcLibDir = Directory(srcDir / "lib") @@ -82,7 +82,7 @@ object PathSettings { * if one of those environment variables is set, then the lib directory under java.home, * and finally the lib directory under the parent of java.home. Or, as a last resort, * search deeply under those locations (except for the parent of java.home, on the notion - * that if this is not a canonical installation, then that search would have litte + * that if this is not a canonical installation, then that search would have little * chance of succeeding). */ lazy val platformTools: Option[File] = { |