diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-20 09:53:39 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-20 09:53:39 -0700 |
| commit | 3136e53e0ce4d73e1d2b3e8d043fff7892b2f439 (patch) | |
| tree | 69e6e4c21241e174942bce493aec289b46a6dce9 /test/files/disabled | |
| parent | d834d90d88e1dab6a8621b13c9d4b64d3417a94e (diff) | |
| parent | d87592da76eb555f0e3fc3732169e56b1852fba1 (diff) | |
| download | scala-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')
| -rw-r--r-- | test/files/disabled/A.scala | 11 | ||||
| -rw-r--r-- | test/files/disabled/overloaded_1.check | 6 | ||||
| -rw-r--r-- | test/files/disabled/overloaded_1.test | 2 | ||||
| -rw-r--r-- | test/files/disabled/t4245/A.scala | 3 | ||||
| -rw-r--r-- | test/files/disabled/t4245/t4245.check | 6 | ||||
| -rw-r--r-- | test/files/disabled/t4245/t4245.test | 2 |
6 files changed, 30 insertions, 0 deletions
diff --git a/test/files/disabled/A.scala b/test/files/disabled/A.scala new file mode 100644 index 0000000000..c070faf978 --- /dev/null +++ b/test/files/disabled/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/files/disabled/overloaded_1.check b/test/files/disabled/overloaded_1.check new file mode 100644 index 0000000000..4d643ce6b4 --- /dev/null +++ b/test/files/disabled/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/files/disabled/overloaded_1.test b/test/files/disabled/overloaded_1.test new file mode 100644 index 0000000000..392e0d365f --- /dev/null +++ b/test/files/disabled/overloaded_1.test @@ -0,0 +1,2 @@ +>>compile A.scala +>>compile A.scala 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 |