7 files changed, 34 insertions, 36 deletions
diff --git a/src/templating/test5/Makefile b/src/templating/test5/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test5/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test5/json b/src/templating/test5/json
index 5b2e3d83a..6562fb064 100644
--- a/src/templating/test5/json
+++ b/src/templating/test5/json
@@ -5,12 +5,12 @@
   "in_ca": true,
   "person": false,
   "repo": [
-    { "name": "resque", "who": [ { "committer": "joe" }, { "reviewer": "avrel" }, { "committer": "william" } ] },
-    { "name": "hub", "who": [ { "committer": "jack" }, { "reviewer": "avrel" }, { "committer": "greg" } ]  },
-    { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "committer": "greg" } ]  }
+    { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] },
+    { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ]  },
+    { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ]  }
   ],
   "person?": { "name": "Jon" },
-  "special": "----{{extra}}----",
+  "special": "----{{extra}}----\n",
   "extra": 3.14159,
   "#sharp": "#",
   "!bang": "!",
diff --git a/src/templating/test5/must3.mustache b/src/templating/test5/must3.mustache
index 821aaac33..67eddb1ef 100644
--- a/src/templating/test5/must3.mustache
+++ b/src/templating/test5/must3.mustache
@@ -1,6 +1,6 @@
 must3.mustache == BEGIN
 {{#repo}}
-  <b>{{name}}</b> reviewers:{{#who}} {{reviewer}}{{/who}} committers:{{#who}} {{committer}}{{/who}}
+  <b>{{name}}</b> reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}}
 {{/repo}}
 
 {{#person?}}
@@ -11,7 +11,7 @@ must3.mustache == BEGIN
 =====================================
 %(%! big comment %)%
 %(%#repo%)%
-  <b>%(%name%)%</b> reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% committers:%(%#who%)% %(%committer%)%%(%/who%)%
+  <b>%(%name%)%</b> reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)%
 %(%/repo%)%
 =====================================
 must3.mustache == END
diff --git a/src/templating/test5/resu.ref b/src/templating/test5/resu.ref
index afc396599..f2a608568 100644
--- a/src/templating/test5/resu.ref
+++ b/src/templating/test5/resu.ref
@@ -3,57 +3,35 @@ from json
 ----3.14159----
 =====================================
 not found
-
 =====================================
 without extension first
 must2 == BEGIN
 Hello Chris
 You have just won 10000 dollars!
-
 Well, 6000 dollars, after taxes.
-
 Shown.
-
-
   No person
-
 must2 == END
-
 =====================================
 last with extension
 must3.mustache == BEGIN
-
-  <b>resque</b> reviewers:  avrel  committers: joe  william
-
-  <b>hub</b> reviewers:  avrel  committers: jack  greg
-
-  <b>rip</b> reviewers: joe jack  committers:   greg
-
-
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
 
   Hi Jon!
 
-
-
 =====================================
-
-
-  <b>resque</b> reviewers:  avrel  committers: joe  william
-
-  <b>hub</b> reviewers:  avrel  committers: jack  greg
-
-  <b>rip</b> reviewers: joe jack  committers:   greg
-
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
 =====================================
 must3.mustache == END
-
 =====================================
 Ensure must3 didn't change specials
 
-
   Hi Jon!
 
-
 %(%#person?%)%
   Hi %(%name%)%!
 %(%/person?%)%
diff --git a/src/templating/test5/special b/src/templating/test5/special
deleted file mode 100644
index 02d9975c6..000000000
--- a/src/templating/test5/special
+++ /dev/null
@@ -1 +0,0 @@
-special ==SHOULD NOT BE SEEN==
diff --git a/src/templating/test5/special.mustache b/src/templating/test5/special.mustache
deleted file mode 100644
index 70a771fd6..000000000
--- a/src/templating/test5/special.mustache
+++ /dev/null
@@ -1 +0,0 @@
-special.mustache ==SHOULD NOT BE SEEN==
diff --git a/src/templating/test5/vg.ref b/src/templating/test5/vg.ref
new file mode 100644
index 000000000..89dc21bcb
--- /dev/null
+++ b/src/templating/test5/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 123 allocs, 123 frees, 20,610 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)