fix #17859; rename tests so they run in CI; merge several tests with nim check (#17862)

* rename a test so it runs in CI; merge several tests with nim check

* continue

* continue

* continue

* rename tests/errmsgs/undeclared_routine_compiles.nim -> tests/errmsgs/tundeclared_routine_compiles.nim

7 files changed, 44 insertions, 54 deletions

diff --git a/tests/errmsgs/tundeclared_routine.nim b/tests/errmsgs/tundeclared_routine.nim
new file mode 100644
index 000000000..2f1320fff
--- /dev/null
+++ b/tests/errmsgs/tundeclared_routine.nim
@@ -0,0 +1,44 @@
+discard """
+cmd: '''nim check --hints:off $file'''
+action: reject
+nimout: '''
+tundeclared_routine.nim(24, 17) Error: attempting to call routine: 'myiter'
+  found tundeclared_routine.myiter(a: string) [iterator declared in tundeclared_routine.nim(22, 12)]
+  found tundeclared_routine.myiter() [iterator declared in tundeclared_routine.nim(23, 12)]
+tundeclared_routine.nim(29, 28) Error: invalid pragma: myPragma
+tundeclared_routine.nim(36, 13) Error: undeclared field: 'bar3' for type tundeclared_routine.Foo [type declared in tundeclared_routine.nim(33, 8)]
+  found tundeclared_routine.bar3() [iterator declared in tundeclared_routine.nim(35, 12)]
+tundeclared_routine.nim(41, 13) Error: undeclared field: 'bar4' for type tundeclared_routine.Foo [type declared in tundeclared_routine.nim(39, 8)]
+tundeclared_routine.nim(44, 15) Error: attempting to call routine: 'bad5'
+'''
+"""
+
+
+
+
+
+# line 20
+block:
+  iterator myiter(a:string): int = discard
+  iterator myiter(): int = discard
+  let a = myiter(1)
+
+block:
+  proc myPragma():int=discard
+  iterator myPragma():int=discard
+  proc myfun(a:int): int {.myPragma.} = 1
+  let a = myfun(1)
+
+block:
+  type Foo = object
+  var a = Foo()
+  iterator bar3():int=discard
+  let a2 = a.bar3
+
+block:
+  type Foo = object
+  var a = Foo()
+  let a2 = a.bar4
+
+block:
+  let a = bad5(1)
diff --git a/tests/errmsgs/undeclared_routine_compiles.nim b/tests/errmsgs/tundeclared_routine_compiles.nim
index 21daf82bf..21daf82bf 100644
--- a/tests/errmsgs/undeclared_routine_compiles.nim
+++ b/tests/errmsgs/tundeclared_routine_compiles.nim
diff --git a/tests/errmsgs/undeclared_routine.nim b/tests/errmsgs/undeclared_routine.nim
deleted file mode 100644
index 126ade52a..000000000
--- a/tests/errmsgs/undeclared_routine.nim
+++ /dev/null
@@ -1,13 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "attempting to call routine: 'myiter'"
-nimout: '''undeclared_routine.nim(13, 15) Error: attempting to call routine: 'myiter'
-  found 'undeclared_routine.myiter(a: string)[iterator declared in undeclared_routine.nim(10, 9)]'
-  found 'undeclared_routine.myiter()[iterator declared in undeclared_routine.nim(11, 9)]'
-'''
-"""
-
-iterator myiter(a:string): int = discard
-iterator myiter(): int = discard
-
-let a = myiter(1)
diff --git a/tests/errmsgs/undeclared_routine2.nim b/tests/errmsgs/undeclared_routine2.nim
deleted file mode 100644
index 3e48b48f4..000000000
--- a/tests/errmsgs/undeclared_routine2.nim
+++ /dev/null
@@ -1,9 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "invalid pragma: myPragma"
-"""
-
-proc myPragma():int=discard
-iterator myPragma():int=discard
-proc myfun(a:int): int {.myPragma.} = 1
-let a = myfun(1)
diff --git a/tests/errmsgs/undeclared_routine3.nim b/tests/errmsgs/undeclared_routine3.nim
deleted file mode 100644
index 537871900..000000000
--- a/tests/errmsgs/undeclared_routine3.nim
+++ /dev/null
@@ -1,13 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "undeclared field: 'bar'"
-nimout: '''undeclared_routine3.nim(13, 10) Error: undeclared field: 'bar'
-  found 'undeclared_routine3.bar()[declared in undeclared_routine3.nim(12, 9)]' of kind 'iterator'
-'''
-"""
-
-
-type Foo = object
-var a = Foo()
-iterator bar():int=discard
-let a = a.bar
diff --git a/tests/errmsgs/undeclared_routine4.nim b/tests/errmsgs/undeclared_routine4.nim
deleted file mode 100644
index 9012a983f..000000000
--- a/tests/errmsgs/undeclared_routine4.nim
+++ /dev/null
@@ -1,10 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "undeclared field: 'bar'"
-nimout: '''undeclared_routine4.nim(10, 10) Error: undeclared field: 'bar'
-'''
-"""
-
-type Foo = object
-var a = Foo()
-let a = a.bar
diff --git a/tests/errmsgs/undeclared_routine5.nim b/tests/errmsgs/undeclared_routine5.nim
deleted file mode 100644
index 0387448a4..000000000
--- a/tests/errmsgs/undeclared_routine5.nim
+++ /dev/null
@@ -1,9 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "undeclared identifier: 'myfun'"
-nimout: '''undeclared_routine5.nim(9, 9) Error: undeclared identifier: 'myfun'
-'''
-"""
-
-
-let a = myfun(1)