diff options
Diffstat (limited to 'compiler/test')
| -rw-r--r-- | compiler/test/dotc/tests.scala | 4 | ||||
| -rw-r--r-- | compiler/test/dotty/tools/DottyTypeStealer.scala | 2 | ||||
| -rw-r--r-- | compiler/test/dotty/tools/ShowClassTests.scala | 2 | ||||
| -rw-r--r-- | compiler/test/dotty/tools/dotc/ParallelTesting.scala | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala index 1c80767ee..af2c88e1a 100644 --- a/compiler/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -203,7 +203,9 @@ class tests extends CompilerTest { private val stdlibFiles: List[String] = StdLibSources.whitelisted - @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode) + @Test def compileStdLib = + if (!generatePartestFiles) + compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode) @Test def compileMixed = compileLine( """../tests/pos/B.scala |../scala-scala/src/library/scala/collection/immutable/Seq.scala diff --git a/compiler/test/dotty/tools/DottyTypeStealer.scala b/compiler/test/dotty/tools/DottyTypeStealer.scala index ff6e67e41..727cd9e7d 100644 --- a/compiler/test/dotty/tools/DottyTypeStealer.scala +++ b/compiler/test/dotty/tools/DottyTypeStealer.scala @@ -19,7 +19,7 @@ object DottyTypeStealer extends DottyTest { implicit val ctx = context val findValDef: (List[ValDef], tpd.Tree) => List[ValDef] = (acc , tree) => { tree match { - case t: ValDef if t.name.startsWith(dummyName.toTermName) => t :: acc + case t: ValDef if t.name.startsWith(dummyName) => t :: acc case _ => acc } } diff --git a/compiler/test/dotty/tools/ShowClassTests.scala b/compiler/test/dotty/tools/ShowClassTests.scala index 4aa9e8845..66ae80169 100644 --- a/compiler/test/dotty/tools/ShowClassTests.scala +++ b/compiler/test/dotty/tools/ShowClassTests.scala @@ -65,7 +65,7 @@ class ShowClassTests extends DottyTest { debug_println(s"blacklisted package: $path") else { for ( - sym <- pkg.info.decls if sym.owner == pkg.moduleClass && !(sym.name contains '$') + sym <- pkg.info.decls if sym.owner == pkg.moduleClass && !(sym.name.toString contains '$') ) { debug_println(s"showing $sym in ${pkg.fullName}") if (sym is PackageVal) showPackage(sym.asTerm) diff --git a/compiler/test/dotty/tools/dotc/ParallelTesting.scala b/compiler/test/dotty/tools/dotc/ParallelTesting.scala index 45de03b48..80c56808b 100644 --- a/compiler/test/dotty/tools/dotc/ParallelTesting.scala +++ b/compiler/test/dotty/tools/dotc/ParallelTesting.scala @@ -423,7 +423,8 @@ trait ParallelTesting { self => extends Test(testSources, times, threadLimit, suppressAllOutput) { private def runMain(dir: JFile, testSource: TestSource): Array[String] = { def renderStackTrace(ex: Throwable): String = - ex.getStackTrace + if (ex == null) "" + else ex.getStackTrace .takeWhile(_.getMethodName != "invoke0") .mkString(" ", "\n ", "") |