diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-13 10:42:58 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-13 10:42:58 -0700 |
| commit | 216e09b3ead43039f2e34a135820ef098c3be74e (patch) | |
| tree | c312a233cf3e2cf0c7ddcd679d1437a32dc819ae /test/files/run/classfile-format-51.scala | |
| parent | 9df8f8ae9e36cf1c04929b7b0d2bdfb6fd2f360f (diff) | |
| parent | 18e3e61778918e4e802b8fb75789635409523372 (diff) | |
| download | scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.gz scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.bz2 scala-216e09b3ead43039f2e34a135820ef098c3be74e.zip | |
Merge pull request #4622 from retronym/merge/2.11.x-to-2.12.x-20150713
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/run/classfile-format-51.scala')
| -rw-r--r-- | test/files/run/classfile-format-51.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala index 0e90b881e5..3ef0640b84 100644 --- a/test/files/run/classfile-format-51.scala +++ b/test/files/run/classfile-format-51.scala @@ -13,7 +13,7 @@ import Opcodes._ // // By its nature the test can only work on JDK 7+ because under JDK 6 some of the // classes referred to by DynamicInvoker won't be available and DynamicInvoker won't -// verify. So the test includes a version check that short-circuites the whole test +// verify. So the test includes a version check that short-circuits the whole test // on JDK 6 object Test extends DirectTest { override def extraSettings: String = "-Yopt:l:classpath -usejavacp -d " + testOutput.path + " -cp " + testOutput.path |