tests utils pathRelativeTo

Author: nitely

tests/test_parser.nim

@@ -226,7 +226,7 @@ suite "Public parser":
 
   proc inputFile(fileName: string): InputStream =
     when nimvm:
-      let data = staticRead(testsRelPath(fileName))
+      let data = staticRead(pathRelativeTo(fileName, "tests"))
       unsafeMemoryInput(data)
     else:
       memFileInput(fileName)

tests/test_spec.nim

@@ -19,7 +19,7 @@ include
 
 proc inputFile(fileName: string): InputStream {.raises: [IOError].} =
   when nimvm:
-    let data = staticRead(testsRelPath(fileName))
+    let data = staticRead(pathRelativeTo(fileName, "tests"))
     unsafeMemoryInput(data)
   else:
     memFileInput(fileName)

tests/utils.nim

@@ -21,15 +21,11 @@ func test_dedent*(s: string): string =
     if indent < minIndent: minIndent = indent
   s.unindent(minIndent)
 
-proc testsRelPath*(fileName: string): string =
-  when nimvm:
-    try:
-      relativePath(fileName, "tests")
-    except Exception:
-      doAssert false
-      ""
-  else:
-    fileName
+proc pathRelativeTo*(fileName, base: string): string =
+  try:
+    relativePath(fileName, base)
+  except Exception as err:
+    raise newException(Defect, err.msg)
 
 const
   parsingPath* = "tests/test_vectors/test_parsing"