summaryrefslogtreecommitdiff
path: root/test/files/disabled/t4245
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-20 09:53:39 -0700
committerPaul Phillips <paulp@improving.org>2012-09-20 09:53:39 -0700
commit3136e53e0ce4d73e1d2b3e8d043fff7892b2f439 (patch)
tree69e6e4c21241e174942bce493aec289b46a6dce9 /test/files/disabled/t4245
parentd834d90d88e1dab6a8621b13c9d4b64d3417a94e (diff)
parentd87592da76eb555f0e3fc3732169e56b1852fba1 (diff)
downloadscala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.tar.gz
scala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.tar.bz2
scala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.zip
Merge branch 'pull-1352-reformatted' into 2.10.x
# By Martin Odersky * pull-1352-reformatted: Disabled failing build manager tests. New test case for SI-6337 New test case for closing SI-6385 Value classes: eliminated half-boxing Cleanup of OverridingPairs Fixes SI-6260
Diffstat (limited to 'test/files/disabled/t4245')
-rw-r--r--test/files/disabled/t4245/A.scala3
-rw-r--r--test/files/disabled/t4245/t4245.check6
-rw-r--r--test/files/disabled/t4245/t4245.test2
3 files changed, 11 insertions, 0 deletions
diff --git a/test/files/disabled/t4245/A.scala b/test/files/disabled/t4245/A.scala
new file mode 100644
index 0000000000..7c4efe1b4b
--- /dev/null
+++ b/test/files/disabled/t4245/A.scala
@@ -0,0 +1,3 @@
+class A {
+ class B(val a: Int)
+}
diff --git a/test/files/disabled/t4245/t4245.check b/test/files/disabled/t4245/t4245.check
new file mode 100644
index 0000000000..3d3898c671
--- /dev/null
+++ b/test/files/disabled/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/files/disabled/t4245/t4245.test b/test/files/disabled/t4245/t4245.test
new file mode 100644
index 0000000000..392e0d365f
--- /dev/null
+++ b/test/files/disabled/t4245/t4245.test
@@ -0,0 +1,2 @@
+>>compile A.scala
+>>compile A.scala