diff options
-rw-r--r-- | compiler/test/dotty/tools/dotc/CompilationTests.scala | 2 | ||||
-rw-r--r-- | compiler/test/dotty/tools/dotc/reporting/TestReporter.scala | 13 | ||||
-rw-r--r-- | compiler/test/dotty/tools/vulpix/SummaryReport.scala | 7 | ||||
-rw-r--r-- | tests/disabled/long-running/t2417.check (renamed from tests/run/t2417.check) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t2417.scala (renamed from tests/run/t2417.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t3242.scala (renamed from tests/run/t3242.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t4459.scala (renamed from tests/run/t4459.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t6253a.scala (renamed from tests/run/t6253a.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t6253b.scala (renamed from tests/run/t6253b.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/t6253c.scala (renamed from tests/run/t6253c.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/long-running/vector1.scala (renamed from tests/run/vector1.scala) | 0 | ||||
-rw-r--r-- | tests/run/t3989.scala | 17 | ||||
-rw-r--r-- | tests/run/t6853.scala | 18 |
13 files changed, 7 insertions, 50 deletions
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 504bdd2e0..334d347fc 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -19,7 +19,7 @@ class CompilationTests extends ParallelTesting { // Test suite configuration -------------------------------------------------- - def maxDuration = 180.seconds + def maxDuration = 30.seconds def numberOfSlaves = 5 def safeMode = Properties.testsSafeMode def isInteractive = SummaryReport.isInteractive diff --git a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala index 213181b56..d07d31c74 100644 --- a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala +++ b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala @@ -28,18 +28,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M private[this] var _didCrash = false final def compilerCrashed: Boolean = _didCrash - final def flushToFile(): Unit = - _messageBuf - .iterator - .map(_.replaceAll("\u001b\\[.*?m", "")) - .foreach(filePrintln) - - final def flushToStdErr(): Unit = - _messageBuf - .iterator - .foreach(System.err.println) - - final def inlineInfo(pos: SourcePosition): String = + protected final def inlineInfo(pos: SourcePosition): String = if (pos.exists) { if (pos.outer.exists) s"\ninlined at ${pos.outer}:\n" + inlineInfo(pos.outer) diff --git a/compiler/test/dotty/tools/vulpix/SummaryReport.scala b/compiler/test/dotty/tools/vulpix/SummaryReport.scala index 678d88809..dae83c13d 100644 --- a/compiler/test/dotty/tools/vulpix/SummaryReport.scala +++ b/compiler/test/dotty/tools/vulpix/SummaryReport.scala @@ -131,11 +131,14 @@ final class SummaryReport extends SummaryReporting { if (cleanUps.nonEmpty) cleanUps.foreach(_.apply()) } + private def removeColors(msg: String): String = + msg.replaceAll("\u001b\\[.*?m", "") + def echoToLog(msg: String): Unit = - TestReporter.logPrintln(msg) + TestReporter.logPrintln(removeColors(msg)) def echoToLog(it: Iterator[String]): Unit = { - it.foreach(TestReporter.logPrint) + it.foreach(msg => TestReporter.logPrint(removeColors(msg))) TestReporter.logFlush() } } diff --git a/tests/run/t2417.check b/tests/disabled/long-running/t2417.check index 36c954be2..36c954be2 100644 --- a/tests/run/t2417.check +++ b/tests/disabled/long-running/t2417.check diff --git a/tests/run/t2417.scala b/tests/disabled/long-running/t2417.scala index 80105f72b..80105f72b 100644 --- a/tests/run/t2417.scala +++ b/tests/disabled/long-running/t2417.scala diff --git a/tests/run/t3242.scala b/tests/disabled/long-running/t3242.scala index 6a8ecd7a2..6a8ecd7a2 100644 --- a/tests/run/t3242.scala +++ b/tests/disabled/long-running/t3242.scala diff --git a/tests/run/t4459.scala b/tests/disabled/long-running/t4459.scala index ea3b7420b..ea3b7420b 100644 --- a/tests/run/t4459.scala +++ b/tests/disabled/long-running/t4459.scala diff --git a/tests/run/t6253a.scala b/tests/disabled/long-running/t6253a.scala index c2db1f5af..c2db1f5af 100644 --- a/tests/run/t6253a.scala +++ b/tests/disabled/long-running/t6253a.scala diff --git a/tests/run/t6253b.scala b/tests/disabled/long-running/t6253b.scala index c049aea7f..c049aea7f 100644 --- a/tests/run/t6253b.scala +++ b/tests/disabled/long-running/t6253b.scala diff --git a/tests/run/t6253c.scala b/tests/disabled/long-running/t6253c.scala index 39c3a5b17..39c3a5b17 100644 --- a/tests/run/t6253c.scala +++ b/tests/disabled/long-running/t6253c.scala diff --git a/tests/run/vector1.scala b/tests/disabled/long-running/vector1.scala index d53618396..d53618396 100644 --- a/tests/run/vector1.scala +++ b/tests/disabled/long-running/vector1.scala diff --git a/tests/run/t3989.scala b/tests/run/t3989.scala deleted file mode 100644 index 896283f19..000000000 --- a/tests/run/t3989.scala +++ /dev/null @@ -1,17 +0,0 @@ - - - - - -class Foo{ override def equals(o: Any) = false; override def hashCode = 1} - -// should not result in a stack overflow -object Test { - def main(args: Array[String]): Unit = { - import collection.immutable.HashMap - var m = Map[Foo, Int]() - for (i <- 1 to 30000) m += (new Foo) -> i - assert(m.size == 30000) - m.toString - } -} diff --git a/tests/run/t6853.scala b/tests/run/t6853.scala deleted file mode 100644 index 352375c99..000000000 --- a/tests/run/t6853.scala +++ /dev/null @@ -1,18 +0,0 @@ -// Test cases: the only place we can cut and paste without crying -// ourself to sleep. -object Test { - - def main(args: Array[String]): Unit = { - // First testing the basic operations - val m = collection.mutable.ListMap[String, Int]() - var i = 0 - while(i < 2) { m += ("foo" + i) -> i; i = i+1} - assert(m == Map("foo1"->1,"foo0"->0)) - m-= "foo0" - assert(m == Map("foo1"->1)) - // Now checking if it scales as described in SI-6853 - i = 0 - while(i < 80000) { m += ("foo" + i) -> i; i = i+1} - assert(m.size == 80000) - } -} |