5 files changed, 15 insertions, 13 deletions
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index ce4bd3966..ab8081031 100755
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -823,7 +823,7 @@ proc evalInclude(c: PContext, n: PNode): PNode =
     var f = checkModuleName(n.sons[i])
     var fileIndex = f.fileInfoIdx
     if ContainsOrIncl(c.includedFiles, fileIndex): 
-      GlobalError(n.info, errRecursiveDependencyX, f.shortenDir)
+      GlobalError(n.info, errRecursiveDependencyX, f.extractFilename)
     addSon(result, semStmt(c, gIncludeFile(f)))
     Excl(c.includedFiles, fileIndex)
   
diff --git a/tests/compile/treadx.nim b/tests/compile/treadx.nim
index 13acb0514..49b6ad691 100755
--- a/tests/compile/treadx.nim
+++ b/tests/compile/treadx.nim
@@ -1,12 +1,14 @@
-import posix
 
-var inp = ""
-var buf: array[0..10, char]
-while true:
-  var r = read(0, addr(buf), sizeof(buf)-1)
-  add inp, $buf
-  if r != sizeof(buf)-1: break
+when not defined(windows):
+  import posix
 
-echo inp
-#dafkladskölklödsaf ölksdakölfölksfklwe4iojr389wr 89uweokf sdlkf jweklr jweflksdj fioewjfsdlfsd
+  var inp = ""
+  var buf: array[0..10, char]
+  while true:
+    var r = read(0, addr(buf), sizeof(buf)-1)
+    add inp, $buf
+    if r != sizeof(buf)-1: break
+
+  echo inp
+  #dafkladskölklödsaf ölksdakölfölksfklwe4iojr389wr 89uweokf sdlkf jweklr jweflksdj fioewjfsdlfsd
 
diff --git a/tests/reject/trecinca.nim b/tests/reject/trecinca.nim
index 99750beb9..cf2f7df0c 100755
--- a/tests/reject/trecinca.nim
+++ b/tests/reject/trecinca.nim
@@ -1,7 +1,7 @@
 discard """
   file: "trecincb.nim"
   line: 9
-  errormsg: "recursive dependency: 'tests/reject/trecincb.nim'"
+  errormsg: "recursive dependency: 'trecincb.nim'"
 """
 # Test recursive includes
 
diff --git a/tests/reject/trecincb.nim b/tests/reject/trecincb.nim
index 9dd7d51de..eb0f72db0 100755
--- a/tests/reject/trecincb.nim
+++ b/tests/reject/trecincb.nim
@@ -1,7 +1,7 @@
 discard """
   file: "trecincb.nim"
   line: 9
-  errormsg: "recursive dependency: 'tests/reject/trecincb.nim'"
+  errormsg: "recursive dependency: 'trecincb.nim'"
 """
 # Test recursive includes
 
diff --git a/tests/run/tuserassert.nim b/tests/run/tuserassert.nim
index cf12c4e8b..80748189f 100644
--- a/tests/run/tuserassert.nim
+++ b/tests/run/tuserassert.nim
@@ -3,7 +3,7 @@ discard """
 """
 
 template myAssert(cond: expr) = 
-  when rand(3) < 2:
+  when rand(3) < 3:
     let c = cond.astToStr
     if not cond:
       echo c, "ugh"