aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-04-13 17:38:34 +0200
committerFelix Mulder <felix.mulder@gmail.com>2017-04-13 17:57:14 +0200
commit623a1d43155823cc7506c3223405bb68f459fd50 (patch)
tree7fb85efa08e5b2afed7499eddcde73927c081a45
parent0fe56ea73e6775a315f54772dc6bfb40815c7c98 (diff)
downloaddotty-623a1d43155823cc7506c3223405bb68f459fd50.zip
dotty-623a1d43155823cc7506c3223405bb68f459fd50.tar.gz
dotty-623a1d43155823cc7506c3223405bb68f459fd50.tar.bz2
Fix #2220: disable benchmarks, set run timeout to 30 seconds
-rw-r--r--compiler/test/dotty/tools/dotc/CompilationTests.scala2
-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.scala17
-rw-r--r--tests/run/t6853.scala18
11 files changed, 1 insertions, 36 deletions
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index cf9b200..a5914bf 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -15,7 +15,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/tests/run/t2417.check b/tests/disabled/long-running/t2417.check
index 36c954b..36c954b 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 80105f7..80105f7 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 6a8ecd7..6a8ecd7 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 ea3b742..ea3b742 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 c2db1f5..c2db1f5 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 c049aea..c049aea 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 39c3a5b..39c3a5b 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 d536183..d536183 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 896283f..0000000
--- 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 352375c..0000000
--- 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)
- }
-}