Revert "Avoid static initialization deadlock in run tests."

This reverts commit 8f90105dc4e62e78d53b385df1b2eb29f2855183.

5 files changed, 23 insertions, 34 deletions

diff --git a/tests/run/t5375.scala b/tests/run/t5375.scala
index 256f5435e..8c2c06fde 100644
--- a/tests/run/t5375.scala
+++ b/tests/run/t5375.scala
@@ -1,11 +1,8 @@
-object Test {
+object Test extends dotty.runtime.LegacyApp {
   val foos = (1 to 1000).toSeq
-
-  def main(args: Array[String]): Unit = {
-    try
-      foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i)
-    catch {
-      case ex: RuntimeException => println("Runtime exception")
-    }
+  try
+    foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i)
+  catch {
+    case ex: RuntimeException => println("Runtime exception")
   }
 }
diff --git a/tests/run/t6052.scala b/tests/run/t6052.scala
index 15bffc1eb..e740f00e1 100644
--- a/tests/run/t6052.scala
+++ b/tests/run/t6052.scala
@@ -5,7 +5,7 @@
 
 
 
-object Test {
+object Test extends dotty.runtime.LegacyApp {
   def seqarr(i: Int) = Array[Int]() ++ (0 until i)
   def pararr(i: Int) = seqarr(i).par
 
@@ -15,9 +15,7 @@ object Test {
     assert(gseq == gpar, (gseq, gpar))
   }
 
-  def main(args: Array[String]): Unit = {
-    for (i <- 0 until 20) check(i, _ > 0)
-    for (i <- 0 until 20) check(i, _ % 2)
-    for (i <- 0 until 20) check(i, _ % 4)
-  }
+  for (i <- 0 until 20) check(i, _ > 0)
+  for (i <- 0 until 20) check(i, _ % 2)
+  for (i <- 0 until 20) check(i, _ % 4)
 }
diff --git a/tests/run/t6410.scala b/tests/run/t6410.scala
index 51aaad839..0855ffecd 100644
--- a/tests/run/t6410.scala
+++ b/tests/run/t6410.scala
@@ -1,11 +1,9 @@
 
 
 
-object Test {
-  def main(args: Array[String]): Unit = {
-    val x = collection.parallel.mutable.ParArray.range(1,10) groupBy { _ % 2 } mapValues { _.size }
-    println(x)
-    val y = collection.parallel.immutable.ParVector.range(1,10) groupBy { _ % 2 } mapValues { _.size }
-    println(y)
-  }
+object Test extends dotty.runtime.LegacyApp {
+  val x = collection.parallel.mutable.ParArray.range(1,10) groupBy { _ % 2 } mapValues { _.size }
+  println(x)
+  val y = collection.parallel.immutable.ParVector.range(1,10) groupBy { _ % 2 } mapValues { _.size }
+  println(y)
 }
diff --git a/tests/run/t6467.scala b/tests/run/t6467.scala
index 048ef25e2..e02fb1669 100644
--- a/tests/run/t6467.scala
+++ b/tests/run/t6467.scala
@@ -6,17 +6,15 @@ import collection._
 
 
 
-object Test {
+object Test extends dotty.runtime.LegacyApp {
 
   def compare(s1: String, s2: String): Unit = {
     assert(s1 == s2, s1 + "\nvs.\n" + s2)
   }
 
-  def main(args: Array[String]): Unit = {
-    compare(List(1, 2, 3, 4).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234")
-    compare(List(1, 2, 3, 4).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234")
-    compare(Seq(0 until 100: _*).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString)
-    compare(Seq(0 until 100: _*).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString)
-  }
+  compare(List(1, 2, 3, 4).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234")
+  compare(List(1, 2, 3, 4).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, "1234")
+  compare(Seq(0 until 100: _*).aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString)
+  compare(Seq(0 until 100: _*).par.aggregate(new java.lang.StringBuffer)(_ append _, _ append _).toString, (0 until 100).mkString)
 
 }
diff --git a/tests/run/t7498.scala b/tests/run/t7498.scala
index a2555c6b1..cab598405 100644
--- a/tests/run/t7498.scala
+++ b/tests/run/t7498.scala
@@ -5,18 +5,16 @@
 
 
 
-object Test {
+object Test extends dotty.runtime.LegacyApp {
   import scala.collection.concurrent.TrieMap
 
   class Collision(val idx: Int) {
     override def hashCode = idx % 10
   }
 
-  def main(args: Array[String]): Unit = {
-    val tm = TrieMap[Collision, Unit]()
-    for (i <- 0 until 1000) tm(new Collision(i)) = ()
+  val tm = TrieMap[Collision, Unit]()
+  for (i <- 0 until 1000) tm(new Collision(i)) = ()
 
-    tm.par.foreach(kv => ())
-  }
+  tm.par.foreach(kv => ())
 }