summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-05-19 17:06:11 +0200
committerAraq <rumpf_a@web.de>2013-05-19 17:06:11 +0200
commit7b36d3d6ff390cc512be06a2c065108fc059eb6f (patch)
tree07d576c8ab88f9cc6070b2be8781f40711ba50b5 /tests
parent8ae49eddc8521714926352c66deda2b5c0ac1637 (diff)
downloadNim-7b36d3d6ff390cc512be06a2c065108fc059eb6f.tar.gz
made some tests green
Diffstat (limited to 'tests')
-rw-r--r--tests/reject/tenummix.nim2
-rw-r--r--tests/run/tcurrncy.nim2
-rw-r--r--tests/run/tvarargs_vs_generic.nim2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/reject/tenummix.nim b/tests/reject/tenummix.nim
index 22c07f14a..f58e7989d 100644
--- a/tests/reject/tenummix.nim
+++ b/tests/reject/tenummix.nim
@@ -1,6 +1,6 @@
 discard """
   file: "system.nim"
-  line: 695
+  line: 696
   errormsg: "type mismatch"
 """
 
diff --git a/tests/run/tcurrncy.nim b/tests/run/tcurrncy.nim
index d04620cfb..78dbc2a89 100644
--- a/tests/run/tcurrncy.nim
+++ b/tests/run/tcurrncy.nim
@@ -10,7 +10,7 @@ template Additive(typ: typeDesc): stmt =
   proc `+` *(x: typ): typ {.borrow.}
   proc `-` *(x: typ): typ {.borrow.}
 
-template Multiplicative(typ, base: typeDesc): stmt =
+template Multiplicative(typ, base: typeDesc): stmt {.immediate.} =
   proc `*` *(x: typ, y: base): typ {.borrow.}
   proc `*` *(x: base, y: typ): typ {.borrow.}
   proc `div` *(x: typ, y: base): typ {.borrow.}
diff --git a/tests/run/tvarargs_vs_generic.nim b/tests/run/tvarargs_vs_generic.nim
index 7c1fa67b2..122f3e453 100644
--- a/tests/run/tvarargs_vs_generic.nim
+++ b/tests/run/tvarargs_vs_generic.nim
@@ -1,5 +1,5 @@
 discard """
-  output: "direct\nopenarray\nvarargs"
+  output: "direct\ngeneric\ngeneric"
 """
 
 proc withDirectType(args: string) =