aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2017-03-30 17:15:10 +0200
committerMartin Odersky <odersky@gmail.com>2017-04-11 09:33:12 +0200
commit1c1355994a66d2af714de5cc033da0a27abe146e (patch)
tree6ba09b83d9ea31cc796675b1f10a0933b162d989
parent6786cea6969b9a64bc4583f9c8fbd26bc8fbf372 (diff)
downloaddotty-1c1355994a66d2af714de5cc033da0a27abe146e.tar.gz
dotty-1c1355994a66d2af714de5cc033da0a27abe146e.tar.bz2
dotty-1c1355994a66d2af714de5cc033da0a27abe146e.zip
Fix ParallelTesting NPE
-rw-r--r--compiler/test/dotty/tools/dotc/ParallelTesting.scala3
1 files changed, 2 insertions, 1 deletions
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 ", "")