summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTimothee Cour <timothee.cour2@gmail.com>2020-11-29 17:32:34 -0800
committerGitHub <noreply@github.com>2020-11-29 17:32:34 -0800
commit31a8cf16bbad69efbfbc6f7a593f2141cba06381 (patch)
treec7694e9f13aee85164617500abc09b5a78902531
parent6114df3c24e9c23bfbdbaa204bb100de9d170995 (diff)
downloadNim-31a8cf16bbad69efbfbc6f7a593f2141cba06381.tar.gz
testament spec: remove errmsg alias of errormsg (#16188)
-rw-r--r--testament/specs.nim2
-rw-r--r--testament/tests/shouldfail/tfile.nim2
-rw-r--r--tests/async/tdiscardableproc.nim2
-rw-r--r--tests/destructor/tdestructor_too_late.nim2
-rw-r--r--tests/errmsgs/t8610.nim2
-rw-r--r--tests/errmsgs/t9768.nim2
-rw-r--r--tests/errmsgs/tstaticexprscope.nim2
-rw-r--r--tests/errmsgs/ttypeAllowed.nim2
-rw-r--r--tests/lent/tnot_allowed_lent.nim2
-rw-r--r--tests/lent/tnot_allowed_lent2.nim2
-rw-r--r--tests/nimble/tnimblepathdollar_fault.nim2
-rw-r--r--tests/proc/tfunc_type.nim2
-rw-r--r--tests/proc/tillegalreturntype.nim2
-rw-r--r--tests/varres/tprevent_forloopvar_mutations.nim2
14 files changed, 14 insertions, 14 deletions
diff --git a/testament/specs.nim b/testament/specs.nim
index d2f37b96c..e15dcb85c 100644
--- a/testament/specs.nim
+++ b/testament/specs.nim
@@ -306,7 +306,7 @@ proc parseSpec*(filename: string): TSpec =
         result.msg = e.value
         if result.action != actionRun:
           result.action = actionCompile
-      of "errormsg", "errmsg": # xxx just use errormsg, no need for such aliases
+      of "errormsg":
         result.msg = e.value
         result.action = actionReject
       of "nimout":
diff --git a/testament/tests/shouldfail/tfile.nim b/testament/tests/shouldfail/tfile.nim
index a6c2ad359..20d4bd1f3 100644
--- a/testament/tests/shouldfail/tfile.nim
+++ b/testament/tests/shouldfail/tfile.nim
@@ -1,5 +1,5 @@
 discard """
-errmsg: "undeclared identifier: 'undefined'"
+errormsg: "undeclared identifier: 'undefined'"
 file: "notthisfile.nim"
 """
 
diff --git a/tests/async/tdiscardableproc.nim b/tests/async/tdiscardableproc.nim
index 80286ece0..93cd83be9 100644
--- a/tests/async/tdiscardableproc.nim
+++ b/tests/async/tdiscardableproc.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "Cannot make async proc discardable. Futures have to be checked with `asyncCheck` instead of discarded"
+  errormsg: "Cannot make async proc discardable. Futures have to be checked with `asyncCheck` instead of discarded"
 """
 
 import async
diff --git a/tests/destructor/tdestructor_too_late.nim b/tests/destructor/tdestructor_too_late.nim
index d279280ba..76d1dde84 100644
--- a/tests/destructor/tdestructor_too_late.nim
+++ b/tests/destructor/tdestructor_too_late.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "cannot bind another '=destroy' to: Obj; previous declaration was constructed here implicitly: tdestructor_too_late.nim(7, 16)"
+  errormsg: "cannot bind another '=destroy' to: Obj; previous declaration was constructed here implicitly: tdestructor_too_late.nim(7, 16)"
 """
 type Obj* = object
   v*: int
diff --git a/tests/errmsgs/t8610.nim b/tests/errmsgs/t8610.nim
index 6a253f7ab..d3405bc91 100644
--- a/tests/errmsgs/t8610.nim
+++ b/tests/errmsgs/t8610.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "invalid type: 'type int' for const"
+  errormsg: "invalid type: 'type int' for const"
 """
 ## issue #8610
 const Foo = int
diff --git a/tests/errmsgs/t9768.nim b/tests/errmsgs/t9768.nim
index d369150a5..b72a158c7 100644
--- a/tests/errmsgs/t9768.nim
+++ b/tests/errmsgs/t9768.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "unhandled exception:"
+  errormsg: "unhandled exception:"
   file: "system/fatal.nim"
   nimout: '''
 stack trace: (most recent call last)
diff --git a/tests/errmsgs/tstaticexprscope.nim b/tests/errmsgs/tstaticexprscope.nim
index 7af5bf9b3..6969e389e 100644
--- a/tests/errmsgs/tstaticexprscope.nim
+++ b/tests/errmsgs/tstaticexprscope.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "undeclared identifier: 'z'"
+  errormsg: "undeclared identifier: 'z'"
   line: 11
 """
 
diff --git a/tests/errmsgs/ttypeAllowed.nim b/tests/errmsgs/ttypeAllowed.nim
index 9efbc6ead..516b616e0 100644
--- a/tests/errmsgs/ttypeAllowed.nim
+++ b/tests/errmsgs/ttypeAllowed.nim
@@ -1,6 +1,6 @@
 discard """
 cmd: "nim check $file"
-errmsg: ""
+errormsg: ""
 nimout: '''
 ttypeAllowed.nim(13, 5) Error: invalid type: 'iterator (a: int, b: int, step: Positive): int{.inline, noSideEffect, gcsafe, locks: 0.}' for let
 ttypeAllowed.nim(17, 7) Error: invalid type: 'iterator (a: int, b: int, step: Positive): int{.inline, noSideEffect, gcsafe, locks: 0.}' for const
diff --git a/tests/lent/tnot_allowed_lent.nim b/tests/lent/tnot_allowed_lent.nim
index 2de18d4af..a1db6d184 100644
--- a/tests/lent/tnot_allowed_lent.nim
+++ b/tests/lent/tnot_allowed_lent.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "expression has no address"
+  errormsg: "expression has no address"
 """
 type
   MyObject = object
diff --git a/tests/lent/tnot_allowed_lent2.nim b/tests/lent/tnot_allowed_lent2.nim
index e61cae922..d0c958df3 100644
--- a/tests/lent/tnot_allowed_lent2.nim
+++ b/tests/lent/tnot_allowed_lent2.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "'x' cannot be assigned to"
+  errormsg: "'x' cannot be assigned to"
   line: 10
 """
 
diff --git a/tests/nimble/tnimblepathdollar_fault.nim b/tests/nimble/tnimblepathdollar_fault.nim
index 628802030..3f0270123 100644
--- a/tests/nimble/tnimblepathdollar_fault.nim
+++ b/tests/nimble/tnimblepathdollar_fault.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "cannot open file: pkgA/module"
+  errormsg: "cannot open file: pkgA/module"
 """
 
 # see nims file; comment out `switch("noNimblePath")` there and there would be no error
diff --git a/tests/proc/tfunc_type.nim b/tests/proc/tfunc_type.nim
index 2a583fcb9..93697acb1 100644
--- a/tests/proc/tfunc_type.nim
+++ b/tests/proc/tfunc_type.nim
@@ -1,6 +1,6 @@
 
 discard """
-  errmsg: "func keyword is not allowed in type descriptions, use proc with {.noSideEffect.} pragma instead"
+  errormsg: "func keyword is not allowed in type descriptions, use proc with {.noSideEffect.} pragma instead"
 """
 
 type
diff --git a/tests/proc/tillegalreturntype.nim b/tests/proc/tillegalreturntype.nim
index e26c44bea..799cad53a 100644
--- a/tests/proc/tillegalreturntype.nim
+++ b/tests/proc/tillegalreturntype.nim
@@ -1,6 +1,6 @@
 discard """
   cmd: "nim check $file"
-  errmsg: ""
+  errormsg: ""
   nimout: '''
 tillegalreturntype.nim(11, 11) Error: return type 'typed' is only valid for macros and templates
 tillegalreturntype.nim(14, 11) Error: return type 'untyped' is only valid for macros and templates
diff --git a/tests/varres/tprevent_forloopvar_mutations.nim b/tests/varres/tprevent_forloopvar_mutations.nim
index ac62608af..15f31d8a3 100644
--- a/tests/varres/tprevent_forloopvar_mutations.nim
+++ b/tests/varres/tprevent_forloopvar_mutations.nim
@@ -1,5 +1,5 @@
 discard """
-  errmsg: "type mismatch: got <int>"
+  errormsg: "type mismatch: got <int>"
   line: 17
   nimout: '''type mismatch: got <int>
 but expected one of: