summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 05:49:38 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 05:49:38 -0700
commit9c7915715d2a00f62b597b9d4eff1c36c36e14ba (patch)
treef28854c253485a7fbeda4c2864cb4359543c566d /test/files/pos
parenta5dcbbc54d48610289218ea3b4d85b47f7cf607c (diff)
parent1729b26500506530733753d44f9ce2a2597e0e33 (diff)
downloadscala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.tar.gz
scala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.tar.bz2
scala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.zip
Merge pull request #921 from adriaanm/ticket-spuriousness
move test files that fail spuriously to pending
Diffstat (limited to 'test/files/pos')
-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
14 files changed, 0 insertions, 54 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