Merge pull request #86 from Tass/master

Fixed IO tests.
This commit is contained in:
Araq
2012-01-02 14:30:46 -08:00
3 changed files with 6 additions and 13 deletions

View File

@@ -140,10 +140,9 @@ proc rejectThreadTests(r: var TResults, options: string) =
# ------------------------- IO tests -----------------------------------
proc compileIOTests(r: var TResults, options: string) =
compileSingleTest(r, "tests/system/helpers/readall_echo.nim", options)
proc runIOTests(r: var TResults, options: string) =
# We need readall_echo to be compiled for this test to run.
compileSingleTest(r, "tests/system/helpers/readall_echo", options)
runSingleTest(r, "tests/system/io", options)
# ------------------------- register special tests here -----------------------
@@ -163,6 +162,5 @@ proc compileSpecialTests(r: var TResults, options: string) =
compileSingleTest(r, "compiler/c2nim/c2nim.nim", options)
compileSingleTest(r, "compiler/pas2nim/pas2nim.nim", options)
compileIOTests(r, options)
compileDLLTests(r, options)

View File

@@ -1 +1,2 @@
echo(stdin.readAll)
when isMainModule:
echo(stdin.readAll)

View File

@@ -1,12 +1,6 @@
discard """output: '''[OK] stdin
[OK] file'''
disabled: true
"""
import
unittest, osproc, streams, os, "helpers/readall_echo"
const STRING_DATA = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."""
unittest, osproc, streams, os
const STRING_DATA = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
const TEST_FILE = "tests/testdata/string"
proc echoLoop(str: string): string =