summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-03 12:12:00 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-03 12:12:00 +0000
commitb6afe3dc0c983435b49c014a206e3fd2b2334d17 (patch)
tree852b4701023567c937546496fc24ed756c8f2461 /test/files
parent95fa7114881187ca083161e08948930929a20dc7 (diff)
downloadscala-b6afe3dc0c983435b49c014a206e3fd2b2334d17.tar.gz
scala-b6afe3dc0c983435b49c014a206e3fd2b2334d17.tar.bz2
scala-b6afe3dc0c983435b49c014a206e3fd2b2334d17.zip
Merged revisions 22472 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22472 | extempore | 2010-07-02 08:26:29 +0200 (Fri, 02 Jul 2010) | 3 lines Made a null output sink and applied it to the recently failing test, which is displaying non-deterministic output by way of the underlying parser. No review. ........
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/xml-loop-bug.checkbin280 -> 0 bytes
-rw-r--r--test/files/run/xml-loop-bug.scala1
2 files changed, 1 insertions, 0 deletions
diff --git a/test/files/run/xml-loop-bug.check b/test/files/run/xml-loop-bug.check
deleted file mode 100644
index a31b93d0cf..0000000000
--- a/test/files/run/xml-loop-bug.check
+++ /dev/null
Binary files differ
diff --git a/test/files/run/xml-loop-bug.scala b/test/files/run/xml-loop-bug.scala
index acb3c5c6da..3894779f7c 100644
--- a/test/files/run/xml-loop-bug.scala
+++ b/test/files/run/xml-loop-bug.scala
@@ -1,5 +1,6 @@
object Test {
def main(args: Array[String]): Unit = {
+ scala.tools.nsc.io.NullPrintStream.setOutAndErr()
scala.xml.parsing.ConstructingParser.fromSource(scala.io.Source.fromString("<!DOCTYPE xmeml SYSTEM> <xmeml> <sequence> </sequence> </xmeml> "), true).document.docElem
}
}