Fix 25 typos (s)

4 files changed, 5 insertions, 5 deletions

diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala
index 7523130afa..81df2f08d9 100644
--- a/test/files/run/classfile-format-51.scala
+++ b/test/files/run/classfile-format-51.scala
@@ -14,7 +14,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 = "-optimise -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
diff --git a/test/files/run/complicatedmatch.scala b/test/files/run/complicatedmatch.scala
index 681029aa13..1676a4115a 100644
--- a/test/files/run/complicatedmatch.scala
+++ b/test/files/run/complicatedmatch.scala
@@ -7,7 +7,7 @@ object Even{
 }
 
 object Test extends App{
-  val LongWord = "supercalifragilisticexpialadocious";
+  val LongWord = "supercalifragilisticexpialidocious";
 
   def foo(x : Int, y : String) : Int = (x, y) match {
     case (Even(i), "bar") => 1
diff --git a/test/files/run/nothingTypeNoFramesNoDce.scala b/test/files/run/nothingTypeNoFramesNoDce.scala
index 3d1298303a..7f63faeaa7 100644
--- a/test/files/run/nothingTypeNoFramesNoDce.scala
+++ b/test/files/run/nothingTypeNoFramesNoDce.scala
@@ -26,7 +26,7 @@ class C {
   }
 
   def f5(x: Boolean) = {
-    // stack heights need to be the smae. ??? looks to the jvm like returning a value of
+    // stack heights need to be the same. ??? looks to the jvm like returning a value of
     // type Nothing$, need to drop or throw it.
     println(
       if (x) { ???; 10 }
diff --git a/test/files/run/t8010.scala b/test/files/run/t8010.scala
index 8636bbd12e..c78d45a43b 100644
--- a/test/files/run/t8010.scala
+++ b/test/files/run/t8010.scala
@@ -5,7 +5,7 @@ trait Base {
   def bt(n: Int) = n
 }
 trait Derived extends Base {
-  // was: double defintion error
+  // was: double definition error
   override def t          = 1 + super.t
   override def t(n: Int)  = 1 + super.t(n)
   override def bt         = 1 + super.bt
@@ -14,7 +14,7 @@ trait Derived extends Base {
 
 object Test extends App {
   val d = new Derived {}
-  // not the focus of thie bug, but let's just check the runtime behaviour while we're here.
+  // not the focus of this bug, but let's just check the runtime behaviour while we're here.
   assert(d.t == 2)
   assert(d.t(1) == 2)
   assert(d.bt == 3)