From 6d6c182ae1b25919c573373ea27759041f579e4c Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 4 Oct 2012 21:20:35 -0700 Subject: Moved some disabled test to the right place. It's test/disabled/XXX, not test/files/disabled/XXX. --- test/disabled/buildmanager/overloaded_1/A.scala | 11 +++++++++++ test/disabled/buildmanager/overloaded_1/overloaded_1.check | 6 ++++++ test/disabled/buildmanager/overloaded_1/overloaded_1.test | 2 ++ test/disabled/buildmanager/t4245/A.scala | 3 +++ test/disabled/buildmanager/t4245/t4245.check | 6 ++++++ test/disabled/buildmanager/t4245/t4245.test | 2 ++ 6 files changed, 30 insertions(+) create mode 100644 test/disabled/buildmanager/overloaded_1/A.scala create mode 100644 test/disabled/buildmanager/overloaded_1/overloaded_1.check create mode 100644 test/disabled/buildmanager/overloaded_1/overloaded_1.test create mode 100644 test/disabled/buildmanager/t4245/A.scala create mode 100644 test/disabled/buildmanager/t4245/t4245.check create mode 100644 test/disabled/buildmanager/t4245/t4245.test (limited to 'test/disabled/buildmanager') 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 -- cgit v1.2.3