summary refs log tree commit diff stats
path: root/tests/generics
diff options
context:
space:
mode:
authorArne Döring <arne.doering@gmx.net>2018-11-29 16:07:51 +0100
committerAraq <rumpf_a@web.de>2018-12-11 21:23:21 +0100
commit1105d0364401226a2d7d479bd89d77a9da9ed787 (patch)
tree559160c7497208ca53fb05fc5e97ae03e12e4187 /tests/generics
parentca394ebd9514edd6e5f5e5c3d3145aa868744647 (diff)
downloadNim-1105d0364401226a2d7d479bd89d77a9da9ed787.tar.gz
require errormsg to be specified before file.
Diffstat (limited to 'tests/generics')
-rw-r--r--tests/generics/t6137.nim3
-rw-r--r--tests/generics/t7141.nim3
-rw-r--r--tests/generics/t8270.nim2
-rw-r--r--tests/generics/tbintre2.nim4
-rw-r--r--tests/generics/tbintree.nim3
-rw-r--r--tests/generics/texplicitgeneric1.nim4
6 files changed, 3 insertions, 16 deletions
diff --git a/tests/generics/t6137.nim b/tests/generics/t6137.nim
index 639675f35..abf02a756 100644
--- a/tests/generics/t6137.nim
+++ b/tests/generics/t6137.nim
@@ -1,7 +1,6 @@
 discard """
-  action: "reject"
-  line: 29
   errormsg: "\'vectFunc\' doesn't have a concrete type, due to unspecified generic parameters."
+  line: 28
 """
 
 type
diff --git a/tests/generics/t7141.nim b/tests/generics/t7141.nim
index 8a128d828..b1e9cbf43 100644
--- a/tests/generics/t7141.nim
+++ b/tests/generics/t7141.nim
@@ -1,7 +1,6 @@
 discard """
-  action: "reject"
-  line: 7
   errormsg: "cannot instantiate: \'T\'"
+  line: 6
 """
 
 proc foo[T](x: T) =
diff --git a/tests/generics/t8270.nim b/tests/generics/t8270.nim
index 707e981fa..1e731d1d4 100644
--- a/tests/generics/t8270.nim
+++ b/tests/generics/t8270.nim
@@ -1,6 +1,6 @@
 discard """
-  line: 6
   errormsg: "cannot instantiate: \'T\'"
+  line: 6
 """
 
 proc m[T](x: T): int = discard
diff --git a/tests/generics/tbintre2.nim b/tests/generics/tbintre2.nim
index eb46b5157..4f63cc5f5 100644
--- a/tests/generics/tbintre2.nim
+++ b/tests/generics/tbintre2.nim
@@ -1,5 +1,4 @@
 discard """
-  file: "tbintre2.nim"
   output: "helloworld99110223"
 """
 # Same test, but check module boundaries
@@ -26,6 +25,3 @@ for y in items(r2):
   stdout.write(y)
 
 #OUT helloworld99110223
-
-
-
diff --git a/tests/generics/tbintree.nim b/tests/generics/tbintree.nim
index 13163f764..b4507e298 100644
--- a/tests/generics/tbintree.nim
+++ b/tests/generics/tbintree.nim
@@ -1,5 +1,4 @@
 discard """
-  file: "tbintree.nim"
   output: "helloworld99110223"
 """
 type
@@ -103,5 +102,3 @@ when isMainModule:
     stdout.write(y)
 
 #OUT helloworld99110223
-
-
diff --git a/tests/generics/texplicitgeneric1.nim b/tests/generics/texplicitgeneric1.nim
index ac0197c1a..f093e54d4 100644
--- a/tests/generics/texplicitgeneric1.nim
+++ b/tests/generics/texplicitgeneric1.nim
@@ -1,5 +1,4 @@
 discard """
-  file: "texplicitgeneric1.nim"
   output: "Key: 12 value: 12Key: 13 value: 13 Key: A value: 12 Key: B value: 13"
 """
 # test explicit type instantiation
@@ -33,6 +32,3 @@ c.add('A', "12")
 c.add('B', "13")
 for k, v in items(c):
   stdout.write(" Key: ", $k, " value: ", v)
-
-
-