summaryrefslogtreecommitdiff
path: root/test/disabled
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-10-04 21:20:35 -0700
committerPaul Phillips <paulp@improving.org>2012-10-04 21:28:33 -0700
commit6d6c182ae1b25919c573373ea27759041f579e4c (patch)
tree62046d355e7a76ef0df06a25efa0d0614ccdde57 /test/disabled
parent535ad7abfc841abfdef5110b3ee7d66164a37468 (diff)
downloadscala-6d6c182ae1b25919c573373ea27759041f579e4c.tar.gz
scala-6d6c182ae1b25919c573373ea27759041f579e4c.tar.bz2
scala-6d6c182ae1b25919c573373ea27759041f579e4c.zip
Moved some disabled test to the right place.
It's test/disabled/XXX, not test/files/disabled/XXX.
Diffstat (limited to 'test/disabled')
-rw-r--r--test/disabled/buildmanager/overloaded_1/A.scala11
-rw-r--r--test/disabled/buildmanager/overloaded_1/overloaded_1.check6
-rw-r--r--test/disabled/buildmanager/overloaded_1/overloaded_1.test2
-rw-r--r--test/disabled/buildmanager/t4245/A.scala3
-rw-r--r--test/disabled/buildmanager/t4245/t4245.check6
-rw-r--r--test/disabled/buildmanager/t4245/t4245.test2
6 files changed, 30 insertions, 0 deletions
diff --git a/test/disabled/buildmanager/overloaded_1/A.scala b/test/disabled/buildmanager/overloaded_1/A.scala
new file mode 100644
index 0000000000..c070faf978
--- /dev/null
+++ b/test/disabled/buildmanager/overloaded_1/A.scala
@@ -0,0 +1,11 @@
+trait As {
+ trait C extends D {
+ override def foo = this /// Shouldn't cause the change
+ override def foo(act: List[D]) = this
+ }
+
+ abstract class D{
+ def foo: D = this
+ def foo(act: List[D]) = this
+ }
+}
diff --git a/test/disabled/buildmanager/overloaded_1/overloaded_1.check b/test/disabled/buildmanager/overloaded_1/overloaded_1.check
new file mode 100644
index 0000000000..4d643ce6b4
--- /dev/null
+++ b/test/disabled/buildmanager/overloaded_1/overloaded_1.check
@@ -0,0 +1,6 @@
+builder > A.scala
+compiling Set(A.scala)
+Changes: Map()
+builder > A.scala
+compiling Set(A.scala)
+Changes: Map(class As$D -> List(), object As$C$class -> List(), object As$class -> List(), trait As -> List(), trait As$C -> List())
diff --git a/test/disabled/buildmanager/overloaded_1/overloaded_1.test b/test/disabled/buildmanager/overloaded_1/overloaded_1.test
new file mode 100644
index 0000000000..392e0d365f
--- /dev/null
+++ b/test/disabled/buildmanager/overloaded_1/overloaded_1.test
@@ -0,0 +1,2 @@
+>>compile A.scala
+>>compile A.scala
diff --git a/test/disabled/buildmanager/t4245/A.scala b/test/disabled/buildmanager/t4245/A.scala
new file mode 100644
index 0000000000..7c4efe1b4b
--- /dev/null
+++ b/test/disabled/buildmanager/t4245/A.scala
@@ -0,0 +1,3 @@
+class A {
+ class B(val a: Int)
+}
diff --git a/test/disabled/buildmanager/t4245/t4245.check b/test/disabled/buildmanager/t4245/t4245.check
new file mode 100644
index 0000000000..3d3898c671
--- /dev/null
+++ b/test/disabled/buildmanager/t4245/t4245.check
@@ -0,0 +1,6 @@
+builder > A.scala
+compiling Set(A.scala)
+Changes: Map()
+builder > A.scala
+compiling Set(A.scala)
+Changes: Map(class A -> List(), class A$B -> List())
diff --git a/test/disabled/buildmanager/t4245/t4245.test b/test/disabled/buildmanager/t4245/t4245.test
new file mode 100644
index 0000000000..392e0d365f
--- /dev/null
+++ b/test/disabled/buildmanager/t4245/t4245.test
@@ -0,0 +1,2 @@
+>>compile A.scala
+>>compile A.scala