diff options
author | Som Snytt <som.snytt@gmail.com> | 2013-03-22 14:39:19 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-04 10:57:42 -0700 |
commit | c6ce61796f66770ca1b4d63fc0a569f064436433 (patch) | |
tree | aa263d2764bcf47f024374d6538d94cc952199eb /test/files/scalap/classPrivate | |
parent | 7bb981a9ebb8700c81eca7062537b02bff9b0035 (diff) | |
download | scala-c6ce61796f66770ca1b4d63fc0a569f064436433.tar.gz scala-c6ce61796f66770ca1b4d63fc0a569f064436433.tar.bz2 scala-c6ce61796f66770ca1b4d63fc0a569f064436433.zip |
SI-6289 Partest in technicolor and showing javac errors
Paulptest includes color and simplified test scarfing.
Scalap tests are moved to the conventional name and location.
Testicolor missed out on Josh Suereth's tweak to sort the files in
a compilation round. Restore sortiness to test sources.
Testicolor is due to one of Paul's branches on a timeline
that apparently did not include the destruction of planet
Earth and its colonies by the Xindi.
Thanks also to Szabolcs Berecz for his merge effort. Merging
is thankless work, but not as thankless as merging in a
timeline that actually does terminate in the destruction of
your home world and Enterprise.
Archer had a supremely difficult choice: rescue humanity or
live out his retirement with T'Pol waiting on him hand and
foot? I'm sure I don't know how I'd choose.
Diffstat (limited to 'test/files/scalap/classPrivate')
-rw-r--r-- | test/files/scalap/classPrivate/A.scala | 9 | ||||
-rw-r--r-- | test/files/scalap/classPrivate/result.test | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/test/files/scalap/classPrivate/A.scala b/test/files/scalap/classPrivate/A.scala deleted file mode 100644 index 9f1bd34a6a..0000000000 --- a/test/files/scalap/classPrivate/A.scala +++ /dev/null @@ -1,9 +0,0 @@ -class ClassPrivate { - private def foo = 1 - private[ClassPrivate] def bar = 2 - def baz = 3 - class Outer { - private[ClassPrivate] def qux = 4 - } - protected def quux = 5 -}
\ No newline at end of file diff --git a/test/files/scalap/classPrivate/result.test b/test/files/scalap/classPrivate/result.test deleted file mode 100644 index ab2d40cdaf..0000000000 --- a/test/files/scalap/classPrivate/result.test +++ /dev/null @@ -1,10 +0,0 @@ -class ClassPrivate extends scala.AnyRef { - def this() = { /* compiled code */ } - def baz : scala.Int = { /* compiled code */ } - class Outer extends scala.AnyRef { - def this() = { /* compiled code */ } - private[ClassPrivate] def qux : scala.Int = { /* compiled code */ } - } - protected def quux : scala.Int = { /* compiled code */ } - private[ClassPrivate] def bar : scala.Int = { /* compiled code */ } -} |