summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-17 10:02:55 +0200
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-17 17:26:27 +0200
commit1729b26500506530733753d44f9ce2a2597e0e33 (patch)
treefb21521e8f5d9e4dbf1cc9bcdadc4485492586e3 /test/files
parent022eed3245db21f5faf06ae6472e585ead137f82 (diff)
downloadscala-1729b26500506530733753d44f9ce2a2597e0e33.tar.gz
scala-1729b26500506530733753d44f9ce2a2597e0e33.tar.bz2
scala-1729b26500506530733753d44f9ce2a2597e0e33.zip
move test files that fail spuriously to pending
I have this sneaky suspicion that part of these spurious failures are caused by the recent partest optimizations. @axel22 already checked that compiler instances are not shared between test runs. However, except for the benchmark test, they all have a distinct race condition in symbol loading/type checking feel to them. Since, in the end, the tests and/or their corresponding fixes are as likely a culprit as the test framework, moving them out of the way until their owners can get them back in line and they stop throwing primate wenches into our build. We should bring them back as soon as possible, though.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/t1751.cmds3
-rw-r--r--test/files/pos/t1751/A1_2.scala2
-rw-r--r--test/files/pos/t1751/A2_1.scala2
-rw-r--r--test/files/pos/t1751/SuiteClasses.java3
-rw-r--r--test/files/pos/t1782.cmds2
-rw-r--r--test/files/pos/t1782/Ann.java3
-rw-r--r--test/files/pos/t1782/Days.java3
-rw-r--r--test/files/pos/t1782/ImplementedBy.java3
-rw-r--r--test/files/pos/t1782/Test_1.scala16
-rw-r--r--test/files/pos/t294.cmds3
-rw-r--r--test/files/pos/t294/Ann.java3
-rw-r--r--test/files/pos/t294/Ann2.java3
-rw-r--r--test/files/pos/t294/Test_1.scala7
-rw-r--r--test/files/pos/t294/Test_2.scala1
-rw-r--r--test/files/run/t3897.check8
-rw-r--r--test/files/run/t3897/J_2.java27
-rw-r--r--test/files/run/t3897/a_1.scala8
-rw-r--r--test/files/run/t3897/a_2.scala23
-rw-r--r--test/files/run/t5293-map.scala88
-rw-r--r--test/files/run/t5293.scala83
20 files changed, 0 insertions, 291 deletions
diff --git a/test/files/pos/t1751.cmds b/test/files/pos/t1751.cmds
deleted file mode 100644
index d4a4898ffd..0000000000
--- a/test/files/pos/t1751.cmds
+++ /dev/null
@@ -1,3 +0,0 @@
-javac SuiteClasses.java
-scalac A2_1.scala
-scalac A1_2.scala
diff --git a/test/files/pos/t1751/A1_2.scala b/test/files/pos/t1751/A1_2.scala
deleted file mode 100644
index 354d5eecd0..0000000000
--- a/test/files/pos/t1751/A1_2.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@SuiteClasses(Array(classOf[A2]))
-class A1
diff --git a/test/files/pos/t1751/A2_1.scala b/test/files/pos/t1751/A2_1.scala
deleted file mode 100644
index c768062e43..0000000000
--- a/test/files/pos/t1751/A2_1.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@SuiteClasses(Array())
-class A2
diff --git a/test/files/pos/t1751/SuiteClasses.java b/test/files/pos/t1751/SuiteClasses.java
deleted file mode 100644
index a415e4f572..0000000000
--- a/test/files/pos/t1751/SuiteClasses.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface SuiteClasses {
- public Class<?>[] value();
-}
diff --git a/test/files/pos/t1782.cmds b/test/files/pos/t1782.cmds
deleted file mode 100644
index 61f3d3788e..0000000000
--- a/test/files/pos/t1782.cmds
+++ /dev/null
@@ -1,2 +0,0 @@
-javac Ann.java Days.java ImplementedBy.java
-scalac Test_1.scala
diff --git a/test/files/pos/t1782/Ann.java b/test/files/pos/t1782/Ann.java
deleted file mode 100644
index 0dcfbd2ed7..0000000000
--- a/test/files/pos/t1782/Ann.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann {
- public Days value();
-}
diff --git a/test/files/pos/t1782/Days.java b/test/files/pos/t1782/Days.java
deleted file mode 100644
index 203a87b1c2..0000000000
--- a/test/files/pos/t1782/Days.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public enum Days {
- Friday, Sunday
-}
diff --git a/test/files/pos/t1782/ImplementedBy.java b/test/files/pos/t1782/ImplementedBy.java
deleted file mode 100644
index 6aa8b4fa9e..0000000000
--- a/test/files/pos/t1782/ImplementedBy.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface ImplementedBy {
- public Class<?> value();
-}
diff --git a/test/files/pos/t1782/Test_1.scala b/test/files/pos/t1782/Test_1.scala
deleted file mode 100644
index 6467a74c29..0000000000
--- a/test/files/pos/t1782/Test_1.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-@ImplementedBy(classOf[Provider])
-trait Service {
- def someMethod()
-}
-
-class Provider
- extends Service
-{
- // test enumeration java annotations
- @Ann(Days.Friday) def someMethod() = ()
-
- // #2103
- @scala.beans.BeanProperty
- @Ann(value = Days.Sunday)
- val t2103 = "test"
-}
diff --git a/test/files/pos/t294.cmds b/test/files/pos/t294.cmds
deleted file mode 100644
index 62c9a5a068..0000000000
--- a/test/files/pos/t294.cmds
+++ /dev/null
@@ -1,3 +0,0 @@
-javac Ann.java Ann2.java
-scalac Test_1.scala
-scalac Test_2.scala
diff --git a/test/files/pos/t294/Ann.java b/test/files/pos/t294/Ann.java
deleted file mode 100644
index 934ca46297..0000000000
--- a/test/files/pos/t294/Ann.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann {
- public Ann2[] nested();
-}
diff --git a/test/files/pos/t294/Ann2.java b/test/files/pos/t294/Ann2.java
deleted file mode 100644
index 025b79e794..0000000000
--- a/test/files/pos/t294/Ann2.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann2 {
- public int value();
-}
diff --git a/test/files/pos/t294/Test_1.scala b/test/files/pos/t294/Test_1.scala
deleted file mode 100644
index ff1f34b10e..0000000000
--- a/test/files/pos/t294/Test_1.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-// also test pickling of java annotations; Test_2.scala will
-// read this class file
-@Ann(nested = Array(new Ann2(10))) class Test {
- @Ann2(100) var ctx: Object = _
- @Ann(nested = Array()) def foo = 10
- @Ann(nested = Array(new Ann2(10), new Ann2(23))) val bam = -3
-}
diff --git a/test/files/pos/t294/Test_2.scala b/test/files/pos/t294/Test_2.scala
deleted file mode 100644
index 9fb1c6e175..0000000000
--- a/test/files/pos/t294/Test_2.scala
+++ /dev/null
@@ -1 +0,0 @@
-class Test2 extends Test
diff --git a/test/files/run/t3897.check b/test/files/run/t3897.check
deleted file mode 100644
index 244b83716f..0000000000
--- a/test/files/run/t3897.check
+++ /dev/null
@@ -1,8 +0,0 @@
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
diff --git a/test/files/run/t3897/J_2.java b/test/files/run/t3897/J_2.java
deleted file mode 100644
index 178412dc92..0000000000
--- a/test/files/run/t3897/J_2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import java.lang.reflect.*;
-
-public class J_2 {
- public void f1(Class<?> clazz) {
- Field[] fields = clazz.getDeclaredFields();
- for (int i = 0 ; i < fields.length; i++) {
- String name = fields[i].getName();
- if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
- else System.out.println("(" + name + "," + fields[i].getGenericType() + ")");
- }
- }
- public void f2(Class<?> clazz) {
- Method[] methods = clazz.getDeclaredMethods();
- for (int i = 0 ; i < methods.length; i++) {
- String name = methods[i].getName();
- if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
- else System.out.println("(" + name + "," + methods[i].getGenericReturnType() + ")");
- }
- }
-
- public void javaRun() {
- f1(One.class);
- f2(One.class);
- f1(Two.class);
- f2(Two.class);
- }
-} \ No newline at end of file
diff --git a/test/files/run/t3897/a_1.scala b/test/files/run/t3897/a_1.scala
deleted file mode 100644
index 4da959e2ac..0000000000
--- a/test/files/run/t3897/a_1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-class One {
- private val messages = new collection.mutable.MutableList[String]
- List("a") foreach { messages += _ }
-}
-
-class Two {
- private val messages = new collection.mutable.MutableList[String]
-}
diff --git a/test/files/run/t3897/a_2.scala b/test/files/run/t3897/a_2.scala
deleted file mode 100644
index 4d9e59ef05..0000000000
--- a/test/files/run/t3897/a_2.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-object Test {
- def f1(clazz: Class[_]) = (
- clazz.getDeclaredFields.toList
- . filterNot (_.getName contains "bitmap$")
- . map (f => (f.getName, f.getGenericType))
- . foreach (println)
- )
- def f2(clazz: Class[_]) = (
- clazz.getDeclaredMethods.toList
- . filterNot (_.getName contains "bitmap$")
- . map (f => (f.getName, f.getGenericReturnType))
- . foreach (println)
- )
-
- def main(args: Array[String]): Unit = {
- f1(classOf[One])
- f2(classOf[One])
- f1(classOf[Two])
- f2(classOf[Two])
-
- new J_2().javaRun
- }
-}
diff --git a/test/files/run/t5293-map.scala b/test/files/run/t5293-map.scala
deleted file mode 100644
index 2707aed07e..0000000000
--- a/test/files/run/t5293-map.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-import scala.collection.JavaConverters._
-
-
-
-object Test extends App {
-
- def bench(label: String)(body: => Unit): Long = {
- val start = System.nanoTime
-
- 0.until(10).foreach(_ => body)
-
- val end = System.nanoTime
-
- //println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
- end - start
- }
-
- def benchJava(values: java.util.Map[Int, Int]) = {
- bench("Java Map") {
- val m = new java.util.HashMap[Int, Int]
-
- m.putAll(values)
- }
- }
-
- def benchScala(values: Iterable[(Int, Int)]) = {
- bench("Scala Map") {
- val m = new scala.collection.mutable.HashMap[Int, Int]
-
- m ++= values
- }
- }
-
- def benchScalaSorted(values: Iterable[(Int, Int)]) = {
- bench("Scala Map sorted") {
- val m = new scala.collection.mutable.HashMap[Int, Int]
-
- m ++= values.toArray.sorted
- }
- }
-
- def benchScalaPar(values: Iterable[(Int, Int)]) = {
- bench("Scala ParMap") {
- val m = new scala.collection.parallel.mutable.ParHashMap[Int, Int] map { x => x }
-
- m ++= values
- }
- }
-
- val total = 50000
- val values = (0 until total) zip (0 until total)
- val map = scala.collection.mutable.HashMap.empty[Int, Int]
-
- map ++= values
-
- // warmup
- for (x <- 0 until 5) {
- benchJava(map.asJava)
- benchScala(map)
- benchScalaPar(map)
- benchJava(map.asJava)
- benchScala(map)
- benchScalaPar(map)
- }
-
- val javamap = benchJava(map.asJava)
- val scalamap = benchScala(map)
- val scalaparmap = benchScalaPar(map)
-
- // println(javamap)
- // println(scalamap)
- // println(scalaparmap)
-
- assert(scalamap < (javamap * 10), "scalamap: " + scalamap + " vs. javamap: " + javamap)
- assert(scalaparmap < (javamap * 10), "scalaparmap: " + scalaparmap + " vs. javamap: " + javamap)
-}
-
-
-
-
-
-
-
-
diff --git a/test/files/run/t5293.scala b/test/files/run/t5293.scala
deleted file mode 100644
index 01ead45d2a..0000000000
--- a/test/files/run/t5293.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-import scala.collection.JavaConverters._
-
-
-
-object Test extends App {
-
- def bench(label: String)(body: => Unit): Long = {
- val start = System.nanoTime
-
- 0.until(10).foreach(_ => body)
-
- val end = System.nanoTime
-
- //println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
- end - start
- }
-
- def benchJava(values: java.util.Collection[Int]) = {
- bench("Java Set") {
- val set = new java.util.HashSet[Int]
-
- set.addAll(values)
- }
- }
-
- def benchScala(values: Iterable[Int]) = {
- bench("Scala Set") {
- val set = new scala.collection.mutable.HashSet[Int]
-
- set ++= values
- }
- }
-
- def benchScalaSorted(values: Iterable[Int]) = {
- bench("Scala Set sorted") {
- val set = new scala.collection.mutable.HashSet[Int]
-
- set ++= values.toArray.sorted
- }
- }
-
- def benchScalaPar(values: Iterable[Int]) = {
- bench("Scala ParSet") {
- val set = new scala.collection.parallel.mutable.ParHashSet[Int] map { x => x }
-
- set ++= values
- }
- }
-
- val values = 0 until 50000
- val set = scala.collection.mutable.HashSet.empty[Int]
-
- set ++= values
-
- // warmup
- for (x <- 0 until 5) {
- benchJava(set.asJava)
- benchScala(set)
- benchScalaPar(set)
- benchJava(set.asJava)
- benchScala(set)
- benchScalaPar(set)
- }
-
- val javaset = benchJava(set.asJava)
- val scalaset = benchScala(set)
- val scalaparset = benchScalaPar(set)
-
- assert(scalaset < (javaset * 8), "scalaset: " + scalaset + " vs. javaset: " + javaset)
- assert(scalaparset < (javaset * 8), "scalaparset: " + scalaparset + " vs. javaset: " + javaset)
-}
-
-
-
-
-
-
-
-