fix #16693: testament spec nimout too lax

testament/lib/stdtest/testutils.nim

@@ -27,10 +27,43 @@ template flakyAssert*(cond: untyped, msg = "", notifySuccess = true) =
 
 proc greedyOrderedSubsetLines*(lhs, rhs: string): bool =
   ## returns true if each stripped line in `lhs` appears in rhs, using a greedy matching.
-  let rhs = rhs.strip
-  var currentPos = 0
-  for line in lhs.strip.splitLines:
-    currentPos = rhs.find(line.strip, currentPos)
-    if currentPos < 0:
+  iterator splitLinesLhs(): string {.closure.} =
+    for line in splitLines(lhs.strip):
+      yield line
+
+  var lhsIter = splitLinesLhs
+  var currentLhs: string = strip(lhsIter())
+
+  while currentLhs.len == 0 and not lhsIter.finished:
+    currentLhs = strip(lhsIter())
+
+  if lhsIter.finished:
+    return true
+
+  var rhs = rhs
+  var pos = find(rhs, currentLhs)
+  if pos < 0:
+    return false
+  else:
+    inc(pos, currentLhs.len)
+    rhs = rhs[pos .. ^1]
+
+  iterator splitLinesRhs(): string {.closure.} =
+    for line in splitLines(rhs.strip):
+      yield line
+
+  var rhsIter = splitLinesRhs
+
+  var currentLine = strip(rhsIter())
+
+  for line in lhsIter():
+    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

tests/test/test.nim

@@ -0,0 +1,10 @@
+discard """
+  nimout: '''
+foobar1
+foobar2
+'''
+"""
+
+
+static: echo "foobar1"
+static: echo "foobar2"

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]()]