diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 08:42:11 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 11:45:02 +1000 |
| commit | 18e3e61778918e4e802b8fb75789635409523372 (patch) | |
| tree | 18d67da301f0b63667e9393d3e336b1fcb5e1875 /test/files/jvm | |
| parent | b92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff) | |
| parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
| download | scala-18e3e61778918e4e802b8fb75789635409523372.tar.gz scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2 scala-18e3e61778918e4e802b8fb75789635409523372.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts:
src/eclipse/partest/.classpath
src/eclipse/repl/.classpath
test/files/run/nothingTypeNoFramesNoDce.scala
test/files/run/repl-javap-app.check
Also fixup two .classpath files with updated partest, xml and
parser combinators JARs.
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/innerClassEnclMethodJavaReflection.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/interpreter.check | 2 | ||||
| -rw-r--r-- | test/files/jvm/throws-annot-from-java.check | 2 | ||||
| -rw-r--r-- | test/files/jvm/xml05.check | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/test/files/jvm/innerClassEnclMethodJavaReflection.scala b/test/files/jvm/innerClassEnclMethodJavaReflection.scala index ee39cb43bf..a4d64d0b67 100644 --- a/test/files/jvm/innerClassEnclMethodJavaReflection.scala +++ b/test/files/jvm/innerClassEnclMethodJavaReflection.scala @@ -8,7 +8,7 @@ object Test extends App { // Some classes in scala-compiler.jar have references to jline / ant classes, which seem to be // not on the classpath. We just skip over those classes. // PENDING: for now we also allow missing $anonfun classes: the optimizer may eliminate some closures - // that are refferred to in EnclosingClass attributes. SI-9136 + // that are referred to in EnclosingClass attributes. SI-9136 val allowedMissingPackages = Set("jline", "org.apache.tools.ant", "$anonfun") def ok(t: Throwable) = { diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index 9e875235c7..08372685d6 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -1,5 +1,3 @@ -Type in expressions to have them evaluated. -Type :help for more information. scala> // basics diff --git a/test/files/jvm/throws-annot-from-java.check b/test/files/jvm/throws-annot-from-java.check index c541b26fcc..ace264a4f5 100644 --- a/test/files/jvm/throws-annot-from-java.check +++ b/test/files/jvm/throws-annot-from-java.check @@ -1,5 +1,3 @@ -Type in expressions to have them evaluated. -Type :help for more information. scala> :power ** Power User mode enabled - BEEP WHIR GYVE ** diff --git a/test/files/jvm/xml05.check b/test/files/jvm/xml05.check index cad907525d..d456c5e1e4 100644 --- a/test/files/jvm/xml05.check +++ b/test/files/jvm/xml05.check @@ -1,5 +1,3 @@ -Type in expressions to have them evaluated. -Type :help for more information. scala> <city name="San José"/> res0: scala.xml.Elem = <city name="San José"/> |