assertions: fixes #11545 (#11605)

* assertions: properly fix #11545

* tests/assert: enable excessiveStackTrace

* tests/assert: add test case for #11545

* tfailedassert_stacktrace: disable excessiveStackTrace

* assertions: weird workaround for failing tests

This fixes megatest on *nix, but have no idea why

(cherry picked from commit 2c10b246ec)

lib/system/assertions.nim

@@ -27,13 +27,15 @@ proc failedAssertImpl*(msg: string) {.raises: [], tags: [].} =
   Hide(raiseAssert)(msg)
 
 template assertImpl(cond: bool, msg: string, expr: string, enabled: static[bool]) =
-  const loc = $instantiationInfo(-1, true)
+  const
+    loc = instantiationInfo(fullPaths = compileOption("excessiveStackTrace"))
+    ploc = $loc
   bind instantiationInfo
   mixin failedAssertImpl
   when enabled:
-    {.line: instantiationInfo(fullPaths = compileOption("excessiveStackTrace")).}:
+    {.line: loc.}:
       if not cond:
-        failedAssertImpl(loc & " `" & expr & "` " & msg)
+        failedAssertImpl(ploc & " `" & expr & "` " & msg)
 
 template assert*(cond: untyped, msg = "") =
   ## Raises ``AssertionError`` with `msg` if `cond` is false. Note

tests/assert/config.nims

@@ -0,0 +1 @@
+--excessiveStackTrace:on

tests/assert/testhelper.nim

@@ -1,9 +1,9 @@
 from strutils import endsWith, split
 from os import isAbsolute
 
-proc checkMsg*(msg, expectedEnd, name: string)=
+proc checkMsg*(msg, expectedEnd, name: string, absolute = true)=
   let filePrefix = msg.split(' ', maxSplit = 1)[0]
-  if not filePrefix.isAbsolute:
+  if absolute and not filePrefix.isAbsolute:
     echo name, ":not absolute: `", msg & "`"
   elif not msg.endsWith expectedEnd:
     echo name, ":expected suffix:\n`" & expectedEnd & "`\ngot:\n`" & msg & "`"

tests/assert/tfailedassert_stacktrace.nim

@@ -1,10 +1,11 @@
 discard """
+  cmd: "nim $target $options --excessiveStackTrace:off $file"
   output: '''true'''
 """
 
 const expected = """
-tfailedassert_stacktrace.nim(34) tfailedassert_stacktrace
-tfailedassert_stacktrace.nim(33) foo
+tfailedassert_stacktrace.nim(35) tfailedassert_stacktrace
+tfailedassert_stacktrace.nim(34) foo
 assertions.nim(*)       failedAssertImpl
 assertions.nim(*)       raiseAssert
 fatal.nim(*)            sysFatal"""

tests/assert/trelativeassert.nim

@@ -0,0 +1,11 @@
+discard """
+  cmd: "nim $target $options --excessiveStackTrace:off $file"
+  output: '''
+test:ok
+'''
+"""
+import testhelper
+try:
+  doAssert(false, "msg")
+except AssertionError as e:
+  checkMsg(e.msg, "trelativeassert.nim(9, 11) `false` msg", "test", false)