jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gitutils: add diffStrings, diffFiles, and use it in testament to compare expected vs gotten (#17892)

Browse source 
* gitutils: add diffStrings, diffFiles, and use it in testament to compare expected vs gotten
* refactor with createTempDir
* cleanup
* refacotr
* PRTEMP fake test spec changes to show effect of diffStrings
* add runnableExamples for experimental/diff + cross-reference with gitutils
* Revert "PRTEMP fake test spec changes to show effect of diffStrings"

This reverts commit 57dc8d642dce6c1127c98b7cbc9edbfe747d4047.
This commit is contained in:
Timothee Cour 2021-04-30 02:00:33 -07:00 • committed by GitHub
commit 20248a68fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 99 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nimdoc/rsttester.nim
View file

@ -1,4 +1,5 @@
import os, strutils
from std/private/gitutils import diffFiles
const
baseDir = "nimdoc/rst2html"
@ -19,7 +20,7 @@ proc testRst2Html(fixup = false) =
exec("$1 rst2html $2" % [nimExe, sourceFile])
let producedHtml = expectedHtml.replace('\\', '/').replace("/expected/", "/source/htmldocs/")
if readFile(expectedHtml) != readFile(producedHtml):
discard execShellCmd("diff -uNdr " & expectedHtml & " " & producedHtml)
echo diffFiles(expectedHtml, producedHtml).output
inc failures
if fixup:
copyFile(producedHtml, expectedHtml)

3
nimdoc/tester.nim
View file

@ -3,6 +3,7 @@
# to change expected results (after carefully verifying everything), use -d:fixup
import strutils, os
from std/private/gitutils import diffFiles
var
failures = 0
@ -40,7 +41,7 @@ proc testNimDoc(prjDir, docsDir: string; switches: NimSwitches; fixup = false) =
inc failures
elif readFile(expected) != readFile(produced):
echo "FAILURE: files differ: ", produced
discard execShellCmd("diff -uNdr " & expected & " " & produced)
echo diffFiles(expected, produced).output
inc failures
if fixup:
copyFile(produced, expected)