summaryrefslogtreecommitdiff
path: root/test/pending
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-14 15:35:25 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-14 15:35:25 +0100
commit3d76836bc81c3ec183e83ee186e447ff212507d0 (patch)
tree07809e5efdde62a5419183fd006f407191ef9dc4 /test/pending
parent449fa4c0ff8971d5003e1d2b3d1c993908bcb95f (diff)
parent549dc880c5525e3a2f3ea6af35c7ae8a349b2bdc (diff)
downloadscala-3d76836bc81c3ec183e83ee186e447ff212507d0.tar.gz
scala-3d76836bc81c3ec183e83ee186e447ff212507d0.tar.bz2
scala-3d76836bc81c3ec183e83ee186e447ff212507d0.zip
Merge pull request #4201 from mpociecha/fix-typos-in-docs-and-comments
Fix many typos in docs and comments
Diffstat (limited to 'test/pending')
-rw-r--r--test/pending/jvm/cf-attributes.scala2
-rw-r--r--test/pending/jvm/timeout.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/pending/jvm/cf-attributes.scala b/test/pending/jvm/cf-attributes.scala
index f4964b63b1..2d08f22d8b 100644
--- a/test/pending/jvm/cf-attributes.scala
+++ b/test/pending/jvm/cf-attributes.scala
@@ -62,7 +62,7 @@ object anonymousClasses {
//InnerClass:
// public final #_; //class anonymousClasses$$anon$1 of class anonymousClasses$
val x = new Foo() {
- override def foo() { println("foo (overriden)"); }
+ override def foo() { println("foo (overridden)"); }
def dummy = 0
}
}
diff --git a/test/pending/jvm/timeout.scala b/test/pending/jvm/timeout.scala
index 22b3647dce..8f29f8ddbe 100644
--- a/test/pending/jvm/timeout.scala
+++ b/test/pending/jvm/timeout.scala
@@ -1,4 +1,4 @@
-// Test is in pending because although it suceeds locally,
+// Test is in pending because although it succeeds locally,
// it takes too long on the machine which runs nightly tests.
//
// [partest] EXPECTED: 100 < x < 900