From a22bf14bb6614d763a50e8fd2dba4a7d7d48c9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20D=C3=B6ring?= <arne.doering@gmx.net>
Date: Wed, 28 Nov 2018 11:42:44 +0100
Subject: [PATCH] fix htmlgen, that I broke

---
 testament/backend.nim | 17 +++++++----------
 testament/tester.nim  |  1 +
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/testament/backend.nim b/testament/backend.nim
index a1de5859a2..c2658d6a00 100644
--- a/testament/backend.nim
+++ b/testament/backend.nim
@@ -20,14 +20,11 @@ var
   thisCommit: CommitId
   thisBranch: string
 
-{.experimental.}
-proc `()`(cmd: string{lit}): string = cmd.execProcess.string.strip
-
 proc getMachine*(): MachineId =
-  var name = "hostname"()
+  var name = execProcess("hostname").string.strip
   if name.len == 0:
-    name = when defined(posix): getenv"HOSTNAME".string
-           else: getenv"COMPUTERNAME".string
+    name = when defined(posix): getenv("HOSTNAME").string
+           else: getenv("COMPUTERNAME").string
   if name.len == 0:
     quit "cannot determine the machine name"
 
@@ -35,8 +32,8 @@ proc getMachine*(): MachineId =
 
 proc getCommit(): CommitId =
   const commLen = "commit ".len
-  let hash = "git log -n 1"()[commLen..commLen+10]
-  thisBranch = "git symbolic-ref --short HEAD"()
+  let hash = execProcess("git log -n 1").string.strip[commLen..commLen+10]
+  thisBranch = execProcess("git symbolic-ref --short HEAD").string.strip
   if hash.len == 0 or thisBranch.len == 0: quit "cannot determine git HEAD"
   result = CommitId(hash)
 
@@ -45,7 +42,7 @@ var
   currentCategory: string
   entries: int
 
-proc writeTestResult*(name, category, target, result, expected, given: string) =
+proc writeTestResult*(name, category, target, action, result, expected, given: string) =
   createDir("testresults")
   if currentCategory != category:
     if currentCategory.len > 0:
@@ -57,7 +54,7 @@ proc writeTestResult*(name, category, target, result, expected, given: string) =
     entries = 0
 
   let jentry = %*{"name": name, "category": category, "target": target,
-    "result": result, "expected": expected, "given": given,
+    "action": action, "result": result, "expected": expected, "given": given,
     "machine": thisMachine.string, "commit": thisCommit.string, "branch": thisBranch}
   if entries > 0:
     results.writeLine(",")
diff --git a/testament/tester.nim b/testament/tester.nim
index a82467df72..6a6b735071 100644
--- a/testament/tester.nim
+++ b/testament/tester.nim
@@ -222,6 +222,7 @@ proc addResult(r: var TResults, test: TTest, target: TTarget,
   backend.writeTestResult(name = name,
                           category = test.cat.string,
                           target = $target,
+                          action = $test.spec.action,
                           result = $success,
                           expected = expected,
                           given = given)