diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-03 10:52:28 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-03 10:52:28 -0700 |
| commit | 63999cd7d61482ab2fdd17d37ffa6db323f5f84d (patch) | |
| tree | 29a9ddae826a2ff6c7621b19d5cc63bcdba82055 /test | |
| parent | b37336510f7f2aab50ab4827fc3d762745ef18d8 (diff) | |
| parent | b090f9748fff915df82f2a4908e7075f5cf1c91c (diff) | |
| download | scala-63999cd7d61482ab2fdd17d37ffa6db323f5f84d.tar.gz scala-63999cd7d61482ab2fdd17d37ffa6db323f5f84d.tar.bz2 scala-63999cd7d61482ab2fdd17d37ffa6db323f5f84d.zip | |
Merge pull request #3013 from retronym/topic/unspec-fix-windows
Rework cff8b569 to heal the windows build.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/global-showdef.scala | 2 | ||||
| -rw-r--r-- | test/junit/scala/tools/nsc/symtab/StdNamesTest.scala | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/files/run/global-showdef.scala b/test/files/run/global-showdef.scala index 0dbaba979d..c3ace590ed 100644 --- a/test/files/run/global-showdef.scala +++ b/test/files/run/global-showdef.scala @@ -54,7 +54,7 @@ object Bippy { val run = new compiler.Run() run.compileSources(List(src)) } - (output split "\\n").toList + output.linesIterator.toList } def showClass(name: String) = lines("-Yshow:typer", "-Xshow-class", name) def showObject(name: String) = lines("-Yshow:typer", "-Xshow-object", name) diff --git a/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala b/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala index 05e69978c6..4a39cf9d48 100644 --- a/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala +++ b/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala @@ -28,8 +28,8 @@ class StdNamesTest { test(TermName("Tuple2"), TermName("Tuple2$mcII" + SPECIALIZED_SUFFIX)) test(TermName("foo"), TermName("foo$mIcD" + SPECIALIZED_SUFFIX)) test(TermName("foo"), TermName("foo$mIc" + SPECIALIZED_SUFFIX)) - test(TermName("T1"), TermName(s"T1$SPECIALIZED_SUFFIX")) - test(TermName(""), SPECIALIZED_SUFFIX) + test(nme.EMPTY, TermName(s"T1$SPECIALIZED_SUFFIX")) + test(nme.EMPTY, SPECIALIZED_SUFFIX) } @Test @@ -40,7 +40,7 @@ class StdNamesTest { test((TermName("Tuple2"), "II", ""), TermName("Tuple2$mcII" + SPECIALIZED_SUFFIX)) test((TermName("foo"), "D", "I"), TermName("foo$mIcD" + SPECIALIZED_SUFFIX)) test((TermName("foo"), "", "I"), TermName("foo$mIc" + SPECIALIZED_SUFFIX)) - test((TermName("T1"), "", ""), TermName(s"T1$SPECIALIZED_SUFFIX")) - test((TermName(""), "", ""), SPECIALIZED_SUFFIX) + test((nme.EMPTY, "T1", ""), TermName(s"T1$SPECIALIZED_SUFFIX")) + test((nme.EMPTY, "", ""), SPECIALIZED_SUFFIX) } } |