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

MAP_ANONYMOUS is not always 0x20 for linux; changed the tests

Browse source
This commit is contained in:
Araq 2011-12-31 15:49:48 +01:00
commit 4d9e8e13ae
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/system/alloc.nim
View file

@ -20,14 +20,13 @@ when defined(posix):
PROT_WRITE = 2 # page can be written PROT_WRITE = 2 # page can be written
MAP_PRIVATE = 2 # Changes are private MAP_PRIVATE = 2 # Changes are private
when defined(linux) or defined(aix): when defined(macosx) or defined(bsd):
const MAP_ANONYMOUS = 0x20 # don't use a file
elif defined(macosx) or defined(bsd):
const MAP_ANONYMOUS = 0x1000 const MAP_ANONYMOUS = 0x1000
elif defined(solaris): elif defined(solaris):
const MAP_ANONYMOUS = 0x100 const MAP_ANONYMOUS = 0x100
else: else:
{.error: "Port memory manager to your platform".} var
MAP_ANONYMOUS {.importc: "MAP_ANONYMOUS", header: "<sys/mman.h>".}: cint
proc mmap(adr: pointer, len: int, prot, flags, fildes: cint, proc mmap(adr: pointer, len: int, prot, flags, fildes: cint,
off: int): pointer {.header: "<sys/mman.h>".} off: int): pointer {.header: "<sys/mman.h>".}

15
tests/specials.nim
View file

@ -93,6 +93,15 @@ proc runDLLTests(r: var TResults, options: string) =
runBasicDLLTest c, r, options & " --gc:boehm" runBasicDLLTest c, r, options & " --gc:boehm"
runBasicDLLTest c, r, options & " -d:release --gc:boehm" runBasicDLLTest c, r, options & " -d:release --gc:boehm"
proc compileDLLTests(r: var TResults, options: string) =
# dummy run result:
var c = initResults()
runBasicDLLTest r, c, options
runBasicDLLTest r, c, options & " -d:release"
runBasicDLLTest r, c, options & " --gc:boehm"
runBasicDLLTest r, c, options & " -d:release --gc:boehm"
# ------------------------------ GC tests ------------------------------------- # ------------------------------ GC tests -------------------------------------
proc runGcTests(r: var TResults, options: string) = proc runGcTests(r: var TResults, options: string) =
@ -118,7 +127,8 @@ proc runThreadTests(r: var TResults, options: string) =
test "tactors" test "tactors"
test "threadex" test "threadex"
test "trecursive_actor" # deactivated because output capturing still causes problems sometimes:
#test "trecursive_actor"
#test "threadring" #test "threadring"
#test "tthreadanalysis" #test "tthreadanalysis"
#test "tthreadsort" #test "tthreadsort"
@ -139,7 +149,7 @@ proc runIOTests(r: var TResults, options: string) =
# ------------------------- register special tests here ----------------------- # ------------------------- register special tests here -----------------------
proc runSpecialTests(r: var TResults, options: string) = proc runSpecialTests(r: var TResults, options: string) =
runRodFiles(r, options) runRodFiles(r, options)
runDLLTests(r, options) #runDLLTests(r, options)
runGCTests(r, options) runGCTests(r, options)
runThreadTests(r, options & " --threads:on") runThreadTests(r, options & " --threads:on")
runIOTests(r, options) runIOTests(r, options)
@ -154,4 +164,5 @@ proc compileSpecialTests(r: var TResults, options: string) =
compileSingleTest(r, "compiler/pas2nim/pas2nim.nim", options) compileSingleTest(r, "compiler/pas2nim/pas2nim.nim", options)
compileIOTests(r, options) compileIOTests(r, options)
compileDLLTests(r, options)

5
tests/system/io.nim
View file

@ -1,9 +1,10 @@
discard """output: '''[OK] stdin discard """output: '''[OK] stdin
[OK] file'''""" [OK] file'''
"""
import import
unittest, osproc, streams, os, readall_echo 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.""" 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" const TEST_FILE = "tests/testdata/string"