fix #16693: testament spec nimout too lax (#16698)

Co-authored-by: Timothee Cour <timothee.cour2@gmail.com>

testament/lib/stdtest/testutils.nim

@@ -1,5 +1,4 @@
 import std/private/miscdollars
-import std/strutils
 from std/os import getEnv
 
 template flakyAssert*(cond: untyped, msg = "", notifySuccess = true) =
@@ -26,15 +25,29 @@ template flakyAssert*(cond: untyped, msg = "", notifySuccess = true) =
     msg2.add $expr & " " & msg
     echo msg2
 
-proc greedyOrderedSubsetLines*(lhs, rhs: string): bool =
+when not defined(js):
-  ## returns true if each stripped line in `lhs` appears in rhs, using a greedy matching.
+  import std/strutils
-  let rhs = rhs.strip
+
-  var currentPos = 0
+  proc greedyOrderedSubsetLines*(lhs, rhs: string): bool =
-  for line in lhs.strip.splitLines:
+    ## Returns true if each stripped line in `lhs` appears in rhs, using a greedy matching.
-    currentPos = rhs.find(line.strip, currentPos)
+    iterator splitLinesClosure(): string {.closure.} =
-    if currentPos < 0:
+      for line in splitLines(rhs.strip):
-      return false
+        yield line
-  return true
+
+    var rhsIter = splitLinesClosure
+    var currentLine = strip(rhsIter())
+
+    for line in lhs.strip.splitLines:
+      let line = line.strip
+      if line.len != 0:
+        while line != currentLine:
+          currentLine = strip(rhsIter())
+          if rhsIter.finished:
+            return false
+
+      if rhsIter.finished:
+        return false
+    return true
 
 template enableRemoteNetworking*: bool =
   ## Allows contolling whether to run some test at a statement-level granularity.

testament/tests/shouldfail/tccodecheck.nim

@@ -1,5 +1,6 @@
 discard """
-ccodecheck: "baz"
+  targets: "c"
+  ccodecheck: "baz"
 """
 
 proc foo(): void {.exportc: "bar".}=

testament/tests/shouldfail/tcolumn.nim

@@ -1,7 +1,8 @@
 discard """
-errormsg: "undeclared identifier: 'undeclared'"
+  errormsg: "undeclared identifier: 'undeclared'"
-line: 8
+  targets: "c"
-column: 7
+  line: 9
+  column: 7
 """
 
 # test should fail because the line directive is wrong

testament/tests/shouldfail/terrormsg.nim

@@ -1,7 +1,8 @@
 discard """
-errormsg: "wrong error message"
+  errormsg: "wrong error message"
-line: 8
+  targets: "c"
-column: 6
+  line: 9
+  column: 6
 """
 
 # test should fail because the line directive is wrong

testament/tests/shouldfail/texitcode1.nim

@@ -1,3 +1,4 @@
 discard """
-exitcode: 1
+  targets: "c"
+  exitcode: 1
 """

testament/tests/shouldfail/tfile.nim

@@ -1,6 +1,7 @@
 discard """
-errormsg: "undeclared identifier: 'undefined'"
+  targets: "c"
-file: "notthisfile.nim"
+  errormsg: "undeclared identifier: 'undefined'"
+  file: "notthisfile.nim"
 """
 
 echo undefined

testament/tests/shouldfail/tline.nim

@@ -1,7 +1,8 @@
 discard """
-errormsg: "undeclared identifier: 'undeclared'"
+  targets: "c"
-line: 9
+  errormsg: "undeclared identifier: 'undeclared'"
-column: 6
+  line: 10
+  column: 6
 """
 
 # test should fail because the line directive is wrong

testament/tests/shouldfail/tmaxcodesize.nim

@@ -1,5 +1,6 @@
 discard """
-maxcodesize: 1
+  targets: "c"
+  maxcodesize: 1
 """
 
 echo "Hello World"

testament/tests/shouldfail/tnimout.nim

@@ -1,6 +1,7 @@
 discard """
-nimout: "Hello World!"
+  targets: "c"
-action: compile
+  nimout: "Hello World!"
+  action: compile
 """
 
 static:

testament/tests/shouldfail/toutput.nim

@@ -1,7 +1,8 @@
 discard """
-output: '''
+  targets: "c"
-done
+  output: '''
-'''
+  done
+  '''
 """
 
 echo "broken"

testament/tests/shouldfail/toutputsub.nim

@@ -1,5 +1,6 @@
 discard """
-outputsub: "something else"
+  outputsub: "something else"
+  targets: "c"
 """
 
 echo "Hello World!"

testament/tests/shouldfail/treject.nim

@@ -1,5 +1,6 @@
 discard """
-action: "reject"
+  action: "reject"
+  targets: "c"
 """
 
 # Because we set action="reject", we expect this line not to compile. But the

testament/tests/shouldfail/tsortoutput.nim

@@ -1,9 +1,10 @@
 discard """
-sortoutput: true
+  sortoutput: true
-output: '''
+  targets: "c"
-2
+  output: '''
-1
+  2
-'''
+  1
+  '''
 """
 
 # this test should ensure that the output is actually sorted

testament/tests/shouldfail/ttimeout.nim

@@ -1,5 +1,6 @@
 discard """
   timeout: "0.1"
+  targets: "c"
 """
 
 import os

testament/tests/shouldfail/tvalgrind.nim

@@ -1,6 +1,7 @@
 discard """
-valgrind: true
+  valgrind: true
-cmd: "nim $target --gc:arc -d:useMalloc $options $file"
+  targets: "c"
+  cmd: "nim $target --gc:arc -d:useMalloc $options $file"
 """
 
 # this is the same check used by testament/specs.nim whether or not valgrind

tests/compilerfeatures/texpandmacro.nim

@@ -1,6 +1,6 @@
 discard """
   cmd: "nim c --expandMacro:foo $file"
-  nimout: '''Hint: expanded macro:
+  nimout: '''texpandmacro.nim(17, 1) Hint: expanded macro:
 echo ["injected echo"]
 var x = 4 [ExpandMacro]
 '''

tests/errmsgs/tgcsafety.nim

@@ -2,7 +2,7 @@ discard """
 cmd: "nim check $file"
 errormsg: "type mismatch: got <AsyncHttpServer, Port, proc (req: Request): Future[system.void]{.locks: <unknown>.}>"
 nimout: '''
-type mismatch: got <AsyncHttpServer, Port, proc (req: Request): Future[system.void]{.locks: <unknown>.}>
+tgcsafety.nim(30, 18) Error: type mismatch: got <AsyncHttpServer, Port, proc (req: Request): Future[system.void]{.locks: <unknown>.}>
 but expected one of:
 proc serve(server: AsyncHttpServer; port: Port;
            callback: proc (request: Request): Future[void] {.closure, gcsafe.};

tests/errmsgs/twrongcolon.nim

@@ -1,7 +1,7 @@
 discard """
 errormsg: "in expression ' do:"
 nimout: '''
-Error: in expression ' do:
+twrongcolon.nim(11, 12) Error: in expression ' do:
   890': identifier expected, but found ''
 '''
 

tests/exprs/tresultwarning.nim

@@ -1,5 +1,5 @@
 discard """
-  nimout: "Special variable 'result' is shadowed. [ResultShadowed]"
+  nimout: "tresultwarning.nim(6, 7) Warning: Special variable 'result' is shadowed. [ResultShadowed]"
 """
 
 proc test(): string =

tests/init/tuninit1.nim

@@ -1,5 +1,5 @@
 discard """
-  nimout: "Warning: use explicit initialization of 'y' for clarity [Uninit]"
+  nimout: "tuninit1.nim(35, 11) Warning: use explicit initialization of 'y' for clarity [Uninit]"
   line:34
   action: compile
 """

tests/objvariant/tcheckedfield1.nim

@@ -1,5 +1,5 @@
 discard """
-  nimout: "Warning: cannot prove that field 'x.s' is accessible [ProveField]"
+  nimout: "tcheckedfield1.nim(40, 6) Warning: cannot prove that field 'x.s' is accessible [ProveField]"
   line:51
   action: run
   output: "abc abc"

tests/pragmas/thintprocessing.nim

@@ -0,0 +1,18 @@
+discard """
+  disabled: windows
+  matrix: "--hint:processing"
+  nimout: '''
+compile start
+..
+warn_module.nim(6, 6) Hint: 'test' is declared but not used [XDeclaredButNotUsed]
+compile end
+'''
+"""
+
+static:
+  echo "compile start"
+
+import warn_module
+
+static:
+  echo "compile end"

tests/pragmas/twarning_off.nim

@@ -1,8 +1,6 @@
 discard """
-  matrix: "--hint:processing"
   nimout: '''
 compile start
-..
 warn_module.nim(6, 6) Hint: 'test' is declared but not used [XDeclaredButNotUsed]
 compile end
 '''

tests/stdlib/tcstring.nim

@@ -1,6 +1,6 @@
 discard """
   targets: "c cpp js"
-  matrix: "; --gc:arc"
+  matrix: "--gc:refc; --gc:arc"
 """
 
 from std/sugar import collect

tests/stdlib/ttestutils.nim

@@ -4,3 +4,8 @@ block: # greedyOrderedSubsetLines
   doAssert greedyOrderedSubsetLines("a1\na3", "a0\na1\na2\na3\na4")
   doAssert not greedyOrderedSubsetLines("a3\na1", "a0\na1\na2\na3\na4") # out of order
   doAssert not greedyOrderedSubsetLines("a1\na5", "a0\na1\na2\na3\na4") # a5 not in lhs
+
+  doAssert not greedyOrderedSubsetLines("a1\na5", "a0\na1\na2\na3\na4\nprefix:a5")
+  doAssert not greedyOrderedSubsetLines("a1\na5", "a0\na1\na2\na3\na4\na5:suffix")
+  doAssert not greedyOrderedSubsetLines("a5", "a0\na1\na2\na3\na4\nprefix:a5")
+  doAssert not greedyOrderedSubsetLines("a5", "a0\na1\na2\na3\na4\na5:suffix")

tests/varres/tprevent_forloopvar_mutations.nim

@@ -1,7 +1,7 @@
 discard """
   errormsg: "type mismatch: got <int>"
   line: 17
-  nimout: '''type mismatch: got <int>
+  nimout: '''tprevent_forloopvar_mutations.nim(17, 7) Error: type mismatch: got <int>
 but expected one of:
 proc inc[T: Ordinal](x: var T; y = 1)
   first type mismatch at position: 1

tests/vm/tcompiletimetable.nim

@@ -1,12 +1,16 @@
 discard """
-  nimout: '''2
+  nimout: '''
+2
 3
 4:2
 Got Hi
 Got Hey
+'''
+  output:'''
 a
 b
-c'''
+c
+'''
 """
 
 # bug #404

tests/vm/tmisc_vm.nim

@@ -19,6 +19,7 @@ foo4
 (a: 0, b: 0)
 '''
 """
+import std/sets
 
 #bug #1009
 type
@@ -95,8 +96,6 @@ static: simpleTryFinally()
 
 # bug #10981
 
-import sets
-
 proc main =
   for i in 0..<15:
     var someSets = @[initHashSet[int]()]