vendor/Juniper/libxo/1.4.0vendor/Juniper/libxo

11 files changed, 82 insertions, 5 deletions

diff --git a/tests/core/Makefile.am b/tests/core/Makefile.am
index 9f7ffc441448..a1dad2cc96a2 100644
--- a/tests/core/Makefile.am
+++ b/tests/core/Makefile.am
@@ -88,7 +88,7 @@ TEST_JIG = \
 
 TEST_JIG2 = \
 echo "... $$test ... $$fmt ..."; \
-xoopts==warn,encoder=csv$$csv ; \
+xoopts==warn,$$csv ; \
 ${TEST_JIG}; true;
 
 TEST_FORMATS = T XP JP HP X J H HIPx
@@ -111,9 +111,12 @@ test tests: ${bin_PROGRAMS}
             done) \
 	done)
 	-@ (${TEST_TRACE} test=test_01.c; base=test_01; \
-	    (   fmt=Ecsv1; csv= ; ${TEST_JIG2} ); \
-	    (   fmt=Ecsv2; csv=:path=top/data/item+no-header ; ${TEST_JIG2} ); \
-	    (   fmt=Ecsv3; csv=:path=item+leafs=sku.sold+no-quotes ; ${TEST_JIG2} ); \
+	    (   fmt=Ecsv1; csv=encoder=csv ; \
+			${TEST_JIG2} ); \
+	    (   fmt=Ecsv2; csv=encoder=csv:path=top/data/item:no-header ; \
+			${TEST_JIG2} ); \
+	    (   fmt=Ecsv3; csv=@csv:path=item:leafs=sku.sold:no-quotes ; \
+			${TEST_JIG2} ); \
 	)
 
 
diff --git a/tests/core/saved/test_02.H.out b/tests/core/saved/test_02.H.out
index 66a158502766..a3d88030075a 100644
--- a/tests/core/saved/test_02.H.out
+++ b/tests/core/saved/test_02.H.out
@@ -4,4 +4,7 @@
 </div></div><div class="line"><div class="text">length </div><div class="data" data-tag="length">abcdef</div></div><div class="line"><div class="text">close </div><div class="data" data-tag="fd">-1</div><div class="text"> returned </div><div class="data" data-tag="error">Bad file descriptor</div><div class="text"> </div><div class="data" data-tag="test">good</div></div><div class="line"><div class="text">close </div><div class="data" data-tag="fd">-1</div><div class="text"> returned </div><div class="data" data-tag="error">Bad fi</div><div class="text"> </div><div class="data" data-tag="test">good</div></div><div class="line"><div class="message">improper use of profanity; ten yard penalty; first down
 </div></div><div class="line"><div class="text"> </div><div class="data" data-tag="lines">     20</div><div class="text"> </div><div class="data" data-tag="words">     30</div><div class="text"> </div><div class="data" data-tag="characters">     40</div><div class="text"> </div><div class="data" data-tag="filename">file</div></div><div class="line"><div class="data" data-tag="bytes">0</div><div class="padding"> </div><div class="note">bytes</div></div><div class="line"><div class="data" data-tag="bytes">1</div><div class="padding"> </div><div class="note">byte</div></div><div class="line"><div class="data" data-tag="bytes">2</div><div class="padding"> </div><div class="note">bytes</div></div><div class="line"><div class="data" data-tag="bytes">3</div><div class="padding"> </div><div class="note">bytes</div></div><div class="line"><div class="data" data-tag="bytes">4</div><div class="padding"> </div><div class="note">bytes</div></div><div class="line"><div class="data" data-tag="mbuf-current">10</div><div class="text">/</div><div class="data" data-tag="mbuf-cache">20</div><div class="text">/</div><div class="data" data-tag="mbuf-total">30</div><div class="text"> </div><div class="note">mbufs &lt;&amp;&gt; in use (current/cache/total)</div></div><div class="line"><div class="data" data-tag="distance" data-units="miles">50</div><div class="padding"> </div><div class="text"> from </div><div class="data" data-tag="location">Boston</div></div><div class="line"><div class="data" data-tag="memory" data-units="k">64</div><div class="text"> left out of </div><div class="data" data-tag="total" data-units="kb">640</div></div><div class="line"><div class="data" data-tag="memory" data-units="k">64</div><div class="text"> left out of </div><div class="data" data-tag="total" data-units="kilobytes">640</div></div><div class="line"><div class="title">beforeworkingafter:</div></div><div class="line"><div class="data" data-tag="some">string</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="ten">10</div><div class="data" data-tag="eleven">11</div></div><div class="line"><div class="data" data-tag="unknown">1010</div><div class="text"> </div><div class="note">packets here/there/everywhere</div></div><div class="line"><div class="data" data-tag="unknown">1010</div><div class="text"> </div><div class="note">packets here/there/everywhere</div></div><div class="line"><div class="text">(</div><div class="padding">                     </div><div class="data" data-tag="min">15</div><div class="text">/</div><div class="data" data-tag="cur">20</div><div class="text">/</div><div class="data" data-tag="max">125</div><div class="text">)</div></div><div class="line"><div class="text">(</div><div class="padding">                     </div><div class="data" data-tag="min">15</div><div class="text">/</div><div class="data" data-tag="cur">20</div><div class="text">/</div><div class="data" data-tag="max">125</div><div class="text">)</div></div><div class="line"><div class="text">(</div><div class="data" data-tag="min">15</div><div class="text">/</div><div class="data" data-tag="cur">20</div><div class="text">/</div><div class="data" data-tag="max">125</div><div class="padding">                     </div><div class="text">)</div></div><div class="line"><div class="text">(</div><div class="data" data-tag="min">15</div><div class="text">/</div><div class="data" data-tag="cur">20</div><div class="text">/</div><div class="data" data-tag="max">125</div><div class="padding">                     </div><div class="text">)</div></div><div class="line"><div class="text">Humanize: </div><div class="data" data-tag="val1" data-number="21">21</div><div class="text">, </div><div class="data" data-tag="val2" data-number="58368">57 K</div><div class="text">, </div><div class="data" data-tag="val3" data-number="100663296">96M</div><div class="text">, </div><div class="data" data-tag="val4" data-number="44470272">44M</div><div class="text">, </div><div class="data" data-tag="val5" data-number="1342172800">1.2G</div></div><div class="line"><div class="data" data-tag="flag">one</div><div class="text"> </div><div class="data" data-tag="flag">two</div><div class="text"> </div><div class="data" data-tag="flag">three</div></div><div class="line"><div class="data" data-tag="works">(null)</div></div><div class="line"><div class="text">1:</div><div class="data" data-tag="t1">  1000</div><div class="text"> 2:</div><div class="data" data-tag="t2">test5000    </div><div class="text"> 3:</div><div class="data" data-tag="t3">  ten-longx</div><div class="text"> 4:</div><div class="data" data-tag="t4">xtest      </div></div><div class="line"><div class="error">this is an error</div></div><div class="line"><div class="error">two more errors</div></div><div class="line"><div class="warning">this is an warning</div></div><div class="line"><div class="warning">two more warnings</div></div><div class="line"><div class="label">V1/V2 packets</div><div class="text">: </div><div class="data" data-tag="count">10</div></div><div class="line"><div class="data" data-tag="test">0004</div><div class="text"> </div><div class="label">tries</div></div><div class="line"><div class="message">improper use of profanity; ten yard penalty; first down
 </div></div><div class="line"><div class="error">Shut 'er down, Clancey!  She's a-pumpin' mud!  &lt;&gt;!,"!&lt;&gt;
+</div></div><div class="line"><div class="error">err message (1)</div></div><div class="line"><div class="error">err message (2)
+</div></div><div class="line"><div class="error">err message (1)
+</div></div><div class="line"><div class="error">err message (2)
 </div></div>
\ No newline at end of file
diff --git a/tests/core/saved/test_02.HIPx.out b/tests/core/saved/test_02.HIPx.out
index e2b51086d9b6..984caa3297fe 100644
--- a/tests/core/saved/test_02.HIPx.out
+++ b/tests/core/saved/test_02.HIPx.out
@@ -225,3 +225,18 @@
   <div class="error">Shut 'er down, Clancey!  She's a-pumpin' mud!  &lt;&gt;!,"!&lt;&gt;
 </div>
 </div>
+<div class="line">
+  <div class="error">err message (1)</div>
+</div>
+<div class="line">
+  <div class="error">err message (2)
+</div>
+</div>
+<div class="line">
+  <div class="error">err message (1)
+</div>
+</div>
+<div class="line">
+  <div class="error">err message (2)
+</div>
+</div>
diff --git a/tests/core/saved/test_02.HP.out b/tests/core/saved/test_02.HP.out
index 2a4b954c94ed..f2634522dbcb 100644
--- a/tests/core/saved/test_02.HP.out
+++ b/tests/core/saved/test_02.HP.out
@@ -225,3 +225,18 @@
   <div class="error">Shut 'er down, Clancey!  She's a-pumpin' mud!  &lt;&gt;!,"!&lt;&gt;
 </div>
 </div>
+<div class="line">
+  <div class="error">err message (1)</div>
+</div>
+<div class="line">
+  <div class="error">err message (2)
+</div>
+</div>
+<div class="line">
+  <div class="error">err message (1)
+</div>
+</div>
+<div class="line">
+  <div class="error">err message (2)
+</div>
+</div>
diff --git a/tests/core/saved/test_02.J.out b/tests/core/saved/test_02.J.out
index d6d175339c74..c34e685b4ac5 100644
--- a/tests/core/saved/test_02.J.out
+++ b/tests/core/saved/test_02.J.out
@@ -1 +1 @@
-{"top": {"data": {"name":"em0","flags":"0x8843","name":"em0","flags":"0x8843","what":"braces","length":"abcdef","fd":-1,"error":"Bad file descriptor","test":"good","fd":-1,"error":"Bad fi","test":"good","lines":20,"words":30,"characters":40, "bytes": [0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800, "flag": ["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest", "__error": {"message":"this is an error"}, "__error": {"message":"two more errors"}, "__warning": {"message":"this is an warning"}, "__warning": {"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n"}}}}
+{"top": {"data": {"name":"em0","flags":"0x8843","name":"em0","flags":"0x8843","what":"braces","length":"abcdef","fd":-1,"error":"Bad file descriptor","test":"good","fd":-1,"error":"Bad fi","test":"good","lines":20,"words":30,"characters":40, "bytes": [0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800, "flag": ["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest", "__error": {"message":"this is an error"}, "__error": {"message":"two more errors"}, "__warning": {"message":"this is an warning"}, "__warning": {"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n"}, "error": {"message":"err message (1)"}, "error": {"message":"err message (2)\n"}, "error": {"message":"err message (1)\n"}, "error": {"message":"err message (2)\n"}}}}
diff --git a/tests/core/saved/test_02.JP.out b/tests/core/saved/test_02.JP.out
index cf211401be6f..1a3b464231bd 100644
--- a/tests/core/saved/test_02.JP.out
+++ b/tests/core/saved/test_02.JP.out
@@ -80,6 +80,18 @@
       "test": 4,
       "error": {
         "message": "Shut 'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n"
+      },
+      "error": {
+        "message": "err message (1)"
+      },
+      "error": {
+        "message": "err message (2)\n"
+      },
+      "error": {
+        "message": "err message (1)\n"
+      },
+      "error": {
+        "message": "err message (2)\n"
       }
     }
   }
diff --git a/tests/core/saved/test_02.T.err b/tests/core/saved/test_02.T.err
index d0b94597587c..debdac6a5157 100644
--- a/tests/core/saved/test_02.T.err
+++ b/tests/core/saved/test_02.T.err
@@ -1,2 +1,5 @@
 test_02: key field emitted after normal value field: 'name'
 Shut 'er down, Clancey!  She's a-pumpin' mud!  <>!,"!<>
+err message (1)err message (2)
+err message (1)
+err message (2)
diff --git a/tests/core/saved/test_02.X.out b/tests/core/saved/test_02.X.out
index 2eb122d00c8c..598480be9946 100644
--- a/tests/core/saved/test_02.X.out
+++ b/tests/core/saved/test_02.X.out
@@ -4,4 +4,7 @@
 </message><length>abcdef</length><fd>-1</fd><error>Bad file descriptor</error><test>good</test><fd>-1</fd><error>Bad fi</error><test>good</test><message>improper use of profanity; ten yard penalty; first down
 </message><lines>20</lines><words>30</words><characters>40</characters><bytes>0</bytes><bytes>1</bytes><bytes>2</bytes><bytes>3</bytes><bytes>4</bytes><mbuf-current>10</mbuf-current><mbuf-cache>20</mbuf-cache><mbuf-total>30</mbuf-total><distance units="miles">50</distance><location>Boston</location><memory units="k">64</memory><total units="kb">640</total><memory units="k">64</memory><total units="kilobytes">640</total><ten>10</ten><eleven>11</eleven><unknown>1010</unknown><unknown>1010</unknown><min>15</min><cur>20</cur><max>125</max><min>15</min><cur>20</cur><max>125</max><min>15</min><cur>20</cur><max>125</max><min>15</min><cur>20</cur><max>125</max><val1>21</val1><val2>58368</val2><val3>100663296</val3><val4>44470272</val4><val5>1342172800</val5><flag>one</flag><flag>two</flag><flag>three</flag><works>null</works><empty-tag></empty-tag><t1>1000</t1><t2>test5000</t2><t3>ten-longx</t3><t4>xtest</t4><__error><message>this is an error</message></__error><__error><message>two more errors</message></__error><__warning><message>this is an warning</message></__warning><__warning><message>two more warnings</message></__warning><count>10</count><test>4</test><message>improper use of profanity; ten yard penalty; first down
 </message><error><message>Shut 'er down, Clancey!  She's a-pumpin' mud!  &lt;&gt;!,"!&lt;&gt;
+</message></error><error><message>err message (1)</message></error><error><message>err message (2)
+</message></error><error><message>err message (1)
+</message></error><error><message>err message (2)
 </message></error></data></top>
\ No newline at end of file
diff --git a/tests/core/saved/test_02.XP.out b/tests/core/saved/test_02.XP.out
index 9c18c5edca4f..9a0755e01421 100644
--- a/tests/core/saved/test_02.XP.out
+++ b/tests/core/saved/test_02.XP.out
@@ -87,5 +87,20 @@
       <message>Shut 'er down, Clancey!  She's a-pumpin' mud!  &lt;&gt;!,"!&lt;&gt;
 </message>
     </error>
+    <error>
+      <message>err message (1)</message>
+    </error>
+    <error>
+      <message>err message (2)
+</message>
+    </error>
+    <error>
+      <message>err message (1)
+</message>
+    </error>
+    <error>
+      <message>err message (2)
+</message>
+    </error>
   </data>
 </top>
diff --git a/tests/core/test_02.c b/tests/core/test_02.c
index 7402f04f4b80..4ea8c459047c 100644
--- a/tests/core/test_02.c
+++ b/tests/core/test_02.c
@@ -21,6 +21,8 @@
 int
 main (int argc, char **argv)
 {
+    xo_set_program("test_02");
+
     argc = xo_parse_args(argc, argv);
     if (argc < 0)
 	return 1;
@@ -144,6 +146,10 @@ main (int argc, char **argv)
 	       "ten yard penalty", "first down");
 
     xo_error("Shut 'er down, Clancey!  She's a-pumpin' mud!  <>!,\"!<>\n");
+    xo_error("err message (%d)", 1);
+    xo_error("err message (%d)\n", 2);
+    xo_errorn("err message (%d)", 1);
+    xo_errorn("err message (%d)\n", 2);
 
     xo_close_container("data");
 
diff --git a/tests/core/test_12.c b/tests/core/test_12.c
index 90392196629f..32af2d211857 100644
--- a/tests/core/test_12.c
+++ b/tests/core/test_12.c
@@ -25,6 +25,8 @@ main (int argc, char **argv)
     xo_emit_flags_t flags = XOEF_RETAIN;
     int opt_color = 1;
 
+    xo_set_program("test_12");
+
     argc = xo_parse_args(argc, argv);
     if (argc < 0)
 	return 1;