diff options
| author | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2012-04-23 01:11:05 +0900 |
|---|---|---|
| committer | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2012-04-23 01:11:05 +0900 |
| commit | e59cadeb9dffa7f221d9f4d2f95466f07e867d50 (patch) | |
| tree | f217a10dfd2ad46ebd3797c33d1dc9c03caa78bd | |
| parent | 8c95273b70288e4e3a547fa43f2dbdb40a71b9ea (diff) | |
| download | scala-e59cadeb9dffa7f221d9f4d2f95466f07e867d50.tar.gz scala-e59cadeb9dffa7f221d9f4d2f95466f07e867d50.tar.bz2 scala-e59cadeb9dffa7f221d9f4d2f95466f07e867d50.zip | |
Scaladoc's tests should work with test/partest
Fix SI-5083.
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index 85060ad633..fb3cab52c4 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -213,7 +213,12 @@ class ConsoleRunner extends DirectRunner { * @return (success count, failure count) */ def testCheckAll(enabledSets: List[TestSet]): (Int, Int) = { - def kindOf(f: File) = (srcDir relativize Path(f).toCanonical).segments.head + def kindOf(f: File) = { + (srcDir relativize Path(f).toCanonical).segments match { + case (".." :: "scaladoc" :: xs) => xs.head + case xs => xs.head + } + } val (valid, invalid) = testFiles partition (x => testSetKinds contains kindOf(x)) invalid foreach (x => NestUI.failure( |