jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2307 from def-/test-fixes-2

Browse source 
Test fixes 2
This commit is contained in:
Andreas Rumpf 2015-03-12 11:03:08 +01:00
commit b97207a74c
10 changed files with 31 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/assert/tfailedassert.nim
View file

@ -3,7 +3,7 @@ discard """
WARNING: false first assertion from bar
ERROR: false second assertion from bar
-1
tfailedassert.nim:27 false assertion from foo
tests/assert/tfailedassert.nim:27 false assertion from foo
'''
"""

8
tests/manyloc/argument_parser/ex_wget.nim
View file

@ -8,8 +8,8 @@ const
PARAM_BACKGROUND = @["-b", "--background"]
PARAM_OUTPUT = @["-o", "--output"]
PARAM_NO_CLOBBER = @["-nc", "--no-clobber"]
PARAM_PROGRESS = "--progress"
PARAM_NO_PROXY = "--no-proxy"
PARAM_PROGRESS = @["--progress"]
PARAM_NO_PROXY = @["--no-proxy"]
template P(tnames: varargs[string], thelp: string, ttype = PK_EMPTY,
@ -77,8 +77,8 @@ proc process_commandline(): Tcommandline_results =
quit()
echo "Will download to $1" % [result.options[PARAM_OUTPUT[0]].str_val]
if result.options.hasKey(PARAM_PROGRESS):
echo "Will use progress type $1" % [result.options[PARAM_PROGRESS].str_val]
if result.options.hasKey(PARAM_PROGRESS[0]):
echo "Will use progress type $1" % [result.options[PARAM_PROGRESS[0]].str_val]
when isMainModule:

4
tests/modules/trecinca.nim
View file

@ -1,11 +1,11 @@
discard """
file: "tests/reject/trecincb.nim"
line: 9
errormsg: "recursive dependency: 'trecincb.nim'"
errormsg: "recursive dependency: 'tests/modules/trecincb.nim'"
"""
# Test recursive includes
include trecincb #ERROR_MSG recursive dependency: 'tests/trecincb.nim'
include trecincb
echo "trecina"

4
tests/modules/trecincb.nim
View file

@ -1,12 +1,12 @@
discard """
file: "trecincb.nim"
line: 9
errormsg: "recursive dependency: 'trecincb.nim'"
errormsg: "recursive dependency: 'tests/modules/trecincb.nim'"
"""
# Test recursive includes
include trecincb #ERROR_MSG recursive dependency: 'tests/trecincb.nim'
include trecincb
echo "trecinb"

8
tests/stdlib/tgetfileinfo.nim
View file

@ -65,13 +65,13 @@ proc testGetFileInfo =
try:
discard getFileInfo(testFile)
#echo("Handle : Valid File : Success")
except EIO:
except IOError:
echo("Handle : Valid File : Failure")
try:
discard getFileInfo(testHandle)
#echo("Handle : Valid File : Success")
except EIO:
except IOError:
echo("Handle : Valid File : Failure")
# Case 6 and 8
@ -82,14 +82,14 @@ proc testGetFileInfo =
try:
discard getFileInfo(testFile)
echo("Handle : Invalid File : Failure")
except EIO, EOS:
except IOError, OSError:
discard
#echo("Handle : Invalid File : Success")
try:
discard getFileInfo(testHandle)
echo("Handle : Invalid File : Failure")
except EIO, EOS:
except IOError, OSError:
discard
#echo("Handle : Invalid File : Success")

6
tests/testament/categories.nim
View file

@ -86,9 +86,9 @@ proc runBasicDLLTest(c, r: var TResults, cat: Category, options: string) =
safeCopyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll)
else:
# posix relies on crappy LD_LIBRARY_PATH (ugh!):
var libpath = getenv"LD_LIBRARY_PATH".string
if peg"\i '/nim' (!'/')* '/lib'" notin libpath:
echo "[Warning] insufficient LD_LIBRARY_PATH"
var libpath = getEnv"LD_LIBRARY_PATH".string
# Temporarily add the lib directory to LD_LIBRARY_PATH:
putEnv("LD_LIBRARY_PATH", "lib:" & libpath)
var serverDll = DynlibFormat % "server"
safeCopyFile("tests/dll" / serverDll, "lib" / serverDll)