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 | |
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')
-rw-r--r-- | test/files/scalap/abstractClass.check (renamed from test/files/scalap/abstractClass/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/abstractClass.scala (renamed from test/files/scalap/abstractClass/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/abstractMethod.check (renamed from test/files/scalap/abstractMethod/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/abstractMethod.scala (renamed from test/files/scalap/abstractMethod/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/caseClass.check (renamed from test/files/scalap/caseClass/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/caseClass.scala (renamed from test/files/scalap/caseClass/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/caseObject.check (renamed from test/files/scalap/caseObject/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/caseObject.scala (renamed from test/files/scalap/caseObject/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/cbnParam.check (renamed from test/files/scalap/cbnParam/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/cbnParam.scala (renamed from test/files/scalap/cbnParam/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/classPrivate.check (renamed from test/files/scalap/classPrivate/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/classPrivate.scala (renamed from test/files/scalap/classPrivate/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/classWithExistential.check (renamed from test/files/scalap/classWithExistential/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/classWithExistential.scala (renamed from test/files/scalap/classWithExistential/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/classWithSelfAnnotation.check (renamed from test/files/scalap/classWithSelfAnnotation/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/classWithSelfAnnotation.scala (renamed from test/files/scalap/classWithSelfAnnotation/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/covariantParam.check (renamed from test/files/scalap/covariantParam/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/covariantParam.scala (renamed from test/files/scalap/covariantParam/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/defaultParameter.check (renamed from test/files/scalap/defaultParameter/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/defaultParameter.scala (renamed from test/files/scalap/defaultParameter/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/implicitParam.check (renamed from test/files/scalap/implicitParam/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/implicitParam.scala (renamed from test/files/scalap/implicitParam/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/packageObject.check (renamed from test/files/scalap/packageObject/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/packageObject.scala (renamed from test/files/scalap/packageObject/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/paramClauses.check (renamed from test/files/scalap/paramClauses/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/paramClauses.scala (renamed from test/files/scalap/paramClauses/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/paramNames.check (renamed from test/files/scalap/paramNames/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/paramNames.scala (renamed from test/files/scalap/paramNames/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/sequenceParam.check (renamed from test/files/scalap/sequenceParam/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/sequenceParam.scala (renamed from test/files/scalap/sequenceParam/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/simpleClass.check (renamed from test/files/scalap/simpleClass/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/simpleClass.scala (renamed from test/files/scalap/simpleClass/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/traitObject.check (renamed from test/files/scalap/traitObject/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/traitObject.scala (renamed from test/files/scalap/traitObject/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/typeAnnotations.check (renamed from test/files/scalap/typeAnnotations/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/typeAnnotations.scala (renamed from test/files/scalap/typeAnnotations/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/valAndVar.check (renamed from test/files/scalap/valAndVar/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/valAndVar.scala (renamed from test/files/scalap/valAndVar/A.scala) | 0 | ||||
-rw-r--r-- | test/files/scalap/wildcardType.check (renamed from test/files/scalap/wildcardType/result.test) | 0 | ||||
-rw-r--r-- | test/files/scalap/wildcardType.scala (renamed from test/files/scalap/wildcardType/A.scala) | 0 |
40 files changed, 0 insertions, 0 deletions
diff --git a/test/files/scalap/abstractClass/result.test b/test/files/scalap/abstractClass.check index ef1daac23d..ef1daac23d 100644 --- a/test/files/scalap/abstractClass/result.test +++ b/test/files/scalap/abstractClass.check diff --git a/test/files/scalap/abstractClass/A.scala b/test/files/scalap/abstractClass.scala index 19a528d5a1..19a528d5a1 100644 --- a/test/files/scalap/abstractClass/A.scala +++ b/test/files/scalap/abstractClass.scala diff --git a/test/files/scalap/abstractMethod/result.test b/test/files/scalap/abstractMethod.check index 40fa02d408..40fa02d408 100644 --- a/test/files/scalap/abstractMethod/result.test +++ b/test/files/scalap/abstractMethod.check diff --git a/test/files/scalap/abstractMethod/A.scala b/test/files/scalap/abstractMethod.scala index 4bedb377b3..4bedb377b3 100644 --- a/test/files/scalap/abstractMethod/A.scala +++ b/test/files/scalap/abstractMethod.scala diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass.check index 7d7aa4fd8f..7d7aa4fd8f 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/files/scalap/caseClass.check diff --git a/test/files/scalap/caseClass/A.scala b/test/files/scalap/caseClass.scala index 95f9984519..95f9984519 100644 --- a/test/files/scalap/caseClass/A.scala +++ b/test/files/scalap/caseClass.scala diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject.check index 867a4b2162..867a4b2162 100644 --- a/test/files/scalap/caseObject/result.test +++ b/test/files/scalap/caseObject.check diff --git a/test/files/scalap/caseObject/A.scala b/test/files/scalap/caseObject.scala index 6a3ff10d75..6a3ff10d75 100644 --- a/test/files/scalap/caseObject/A.scala +++ b/test/files/scalap/caseObject.scala diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam.check index 52ecb6ae66..52ecb6ae66 100644 --- a/test/files/scalap/cbnParam/result.test +++ b/test/files/scalap/cbnParam.check diff --git a/test/files/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam.scala index 2f366df64a..2f366df64a 100644 --- a/test/files/scalap/cbnParam/A.scala +++ b/test/files/scalap/cbnParam.scala diff --git a/test/files/scalap/classPrivate/result.test b/test/files/scalap/classPrivate.check index ab2d40cdaf..ab2d40cdaf 100644 --- a/test/files/scalap/classPrivate/result.test +++ b/test/files/scalap/classPrivate.check diff --git a/test/files/scalap/classPrivate/A.scala b/test/files/scalap/classPrivate.scala index 9f1bd34a6a..9f1bd34a6a 100644 --- a/test/files/scalap/classPrivate/A.scala +++ b/test/files/scalap/classPrivate.scala diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential.check index caee3fd6de..caee3fd6de 100644 --- a/test/files/scalap/classWithExistential/result.test +++ b/test/files/scalap/classWithExistential.check diff --git a/test/files/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential.scala index 4a5213f963..4a5213f963 100644 --- a/test/files/scalap/classWithExistential/A.scala +++ b/test/files/scalap/classWithExistential.scala diff --git a/test/files/scalap/classWithSelfAnnotation/result.test b/test/files/scalap/classWithSelfAnnotation.check index 82bbd9e8df..82bbd9e8df 100644 --- a/test/files/scalap/classWithSelfAnnotation/result.test +++ b/test/files/scalap/classWithSelfAnnotation.check diff --git a/test/files/scalap/classWithSelfAnnotation/A.scala b/test/files/scalap/classWithSelfAnnotation.scala index 9e0398622a..9e0398622a 100644 --- a/test/files/scalap/classWithSelfAnnotation/A.scala +++ b/test/files/scalap/classWithSelfAnnotation.scala diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam.check index f7a3c98966..f7a3c98966 100644 --- a/test/files/scalap/covariantParam/result.test +++ b/test/files/scalap/covariantParam.check diff --git a/test/files/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam.scala index 5b2c24d6fa..5b2c24d6fa 100644 --- a/test/files/scalap/covariantParam/A.scala +++ b/test/files/scalap/covariantParam.scala diff --git a/test/files/scalap/defaultParameter/result.test b/test/files/scalap/defaultParameter.check index 0c775ea7b5..0c775ea7b5 100644 --- a/test/files/scalap/defaultParameter/result.test +++ b/test/files/scalap/defaultParameter.check diff --git a/test/files/scalap/defaultParameter/A.scala b/test/files/scalap/defaultParameter.scala index d3514952f4..d3514952f4 100644 --- a/test/files/scalap/defaultParameter/A.scala +++ b/test/files/scalap/defaultParameter.scala diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam.check index a2cfd6092d..a2cfd6092d 100644 --- a/test/files/scalap/implicitParam/result.test +++ b/test/files/scalap/implicitParam.check diff --git a/test/files/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam.scala index 80657218d9..80657218d9 100644 --- a/test/files/scalap/implicitParam/A.scala +++ b/test/files/scalap/implicitParam.scala diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject.check index 5732d92958..5732d92958 100644 --- a/test/files/scalap/packageObject/result.test +++ b/test/files/scalap/packageObject.check diff --git a/test/files/scalap/packageObject/A.scala b/test/files/scalap/packageObject.scala index 7e429c9935..7e429c9935 100644 --- a/test/files/scalap/packageObject/A.scala +++ b/test/files/scalap/packageObject.scala diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses.check index 3a141e8faf..3a141e8faf 100644 --- a/test/files/scalap/paramClauses/result.test +++ b/test/files/scalap/paramClauses.check diff --git a/test/files/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses.scala index f9d1917402..f9d1917402 100644 --- a/test/files/scalap/paramClauses/A.scala +++ b/test/files/scalap/paramClauses.scala diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames.check index 85e37f858d..85e37f858d 100644 --- a/test/files/scalap/paramNames/result.test +++ b/test/files/scalap/paramNames.check diff --git a/test/files/scalap/paramNames/A.scala b/test/files/scalap/paramNames.scala index 7ba9ff0feb..7ba9ff0feb 100644 --- a/test/files/scalap/paramNames/A.scala +++ b/test/files/scalap/paramNames.scala diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam.check index 142d92fea3..142d92fea3 100644 --- a/test/files/scalap/sequenceParam/result.test +++ b/test/files/scalap/sequenceParam.check diff --git a/test/files/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam.scala index 86e13340b9..86e13340b9 100644 --- a/test/files/scalap/sequenceParam/A.scala +++ b/test/files/scalap/sequenceParam.scala diff --git a/test/files/scalap/simpleClass/result.test b/test/files/scalap/simpleClass.check index 4fdf25d1cf..4fdf25d1cf 100644 --- a/test/files/scalap/simpleClass/result.test +++ b/test/files/scalap/simpleClass.check diff --git a/test/files/scalap/simpleClass/A.scala b/test/files/scalap/simpleClass.scala index fa82e62680..fa82e62680 100644 --- a/test/files/scalap/simpleClass/A.scala +++ b/test/files/scalap/simpleClass.scala diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject.check index 104ba14f1a..104ba14f1a 100644 --- a/test/files/scalap/traitObject/result.test +++ b/test/files/scalap/traitObject.check diff --git a/test/files/scalap/traitObject/A.scala b/test/files/scalap/traitObject.scala index d5f43181c1..d5f43181c1 100644 --- a/test/files/scalap/traitObject/A.scala +++ b/test/files/scalap/traitObject.scala diff --git a/test/files/scalap/typeAnnotations/result.test b/test/files/scalap/typeAnnotations.check index 407b0235c6..407b0235c6 100644 --- a/test/files/scalap/typeAnnotations/result.test +++ b/test/files/scalap/typeAnnotations.check diff --git a/test/files/scalap/typeAnnotations/A.scala b/test/files/scalap/typeAnnotations.scala index ff2445edc9..ff2445edc9 100644 --- a/test/files/scalap/typeAnnotations/A.scala +++ b/test/files/scalap/typeAnnotations.scala diff --git a/test/files/scalap/valAndVar/result.test b/test/files/scalap/valAndVar.check index e940da9801..e940da9801 100644 --- a/test/files/scalap/valAndVar/result.test +++ b/test/files/scalap/valAndVar.check diff --git a/test/files/scalap/valAndVar/A.scala b/test/files/scalap/valAndVar.scala index 2d89348401..2d89348401 100644 --- a/test/files/scalap/valAndVar/A.scala +++ b/test/files/scalap/valAndVar.scala diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType.check index e43261db32..e43261db32 100644 --- a/test/files/scalap/wildcardType/result.test +++ b/test/files/scalap/wildcardType.check diff --git a/test/files/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType.scala index 4bb0d14de5..4bb0d14de5 100644 --- a/test/files/scalap/wildcardType/A.scala +++ b/test/files/scalap/wildcardType.scala |