diff options
| author | Som Snytt <som.snytt@gmail.com> | 2013-04-22 09:10:40 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2013-04-22 09:10:40 -0700 |
| commit | 4c715eb0aad082404e037de45f4a83227fcc1ebc (patch) | |
| tree | 960e3f92a918e7b7d3e560ccf7af99ebc333027e | |
| parent | 1d54f26b9a87c8df6a3b0e4472147d1ffb9037f1 (diff) | |
| download | scala-4c715eb0aad082404e037de45f4a83227fcc1ebc.tar.gz scala-4c715eb0aad082404e037de45f4a83227fcc1ebc.tar.bz2 scala-4c715eb0aad082404e037de45f4a83227fcc1ebc.zip | |
Par-Test allows redefinition of srcDir by Ant
Since srcDir is no longer used to extract the test kind from any
given test path, it is especially benign to rely on the defness
of srcDir in order to allow redefinition during an Ant run.
The parameter is configured via the partest.srcdir property.
Maybe the keyword should be def for definite values and
red for redefinable values and ind for indefinite values.
And ded for dedefinable values optionally reset to None.
| -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] = { |