Update command tests to distinguish stderr and test exit status.

15 files changed, 26 insertions, 23 deletions

diff --git a/test/command/1718.md b/test/command/1718.md
index c93067869..a6722b1e4 100644
--- a/test/command/1718.md
+++ b/test/command/1718.md
@@ -6,7 +6,7 @@ Note[^1].
 
 [^2]: the second, unused, note.
 ^D
-[WARNING] Note with key '2' defined at line 5 column 1 but not used.
+2> [WARNING] Note with key '2' defined at line 5 column 1 but not used.
 [ Para
     [ Str "Note"
     , Note
diff --git a/test/command/3752.md b/test/command/3752.md
index bac81b1a1..b7b67cc70 100644
--- a/test/command/3752.md
+++ b/test/command/3752.md
@@ -1,9 +1,9 @@
 ```
 % pandoc command/chap1/text.md command/chap2/text.md -f markdown+rebase_relative_paths --verbose -t docx -o - | pandoc -f docx -t plain
 ^D
-[INFO] Loaded command/chap1/spider.png from command/chap1/spider.png
-[INFO] Loaded command/chap2/spider.png from command/chap2/spider.png
-[INFO] Loaded command/chap1/../../lalune.jpg from command/chap1/../../lalune.jpg
+2> [INFO] Loaded command/chap1/spider.png from command/chap1/spider.png
+2> [INFO] Loaded command/chap2/spider.png from command/chap2/spider.png
+2> [INFO] Loaded command/chap1/../../lalune.jpg from command/chap1/../../lalune.jpg
 Chapter one
 
 A spider: [spider]
diff --git a/test/command/512.md b/test/command/512.md
index 21b3ea9a7..20053d9cd 100644
--- a/test/command/512.md
+++ b/test/command/512.md
@@ -37,7 +37,7 @@ Loop detection:
 
 __ link1_
 ^D
-[WARNING] Circular reference 'link1' at line 1 column 15
+2> [WARNING] Circular reference 'link1' at line 1 column 15
 <p><a href="">click here</a></p>
 ```
 
diff --git a/test/command/5876.md b/test/command/5876.md
index 7671a89cf..a8ede1887 100644
--- a/test/command/5876.md
+++ b/test/command/5876.md
@@ -48,11 +48,13 @@ Pandoc
 % pandoc -s -t native --data-dir=command/5876 --metadata-file=does-not-exist.yaml
 Hello
 ^D
-Could not find metadata file does-not-exist.yaml
+2> Could not find metadata file does-not-exist.yaml
+=> 98
 ```
 ```
 % pandoc -s -t native --metadata-file=does-not-exist.yaml
 Hello
 ^D
-Could not find metadata file does-not-exist.yaml
+2> Could not find metadata file does-not-exist.yaml
+=> 98
 ```
diff --git a/test/command/6837.md b/test/command/6837.md
index cb35e19a1..f3f800bbb 100644
--- a/test/command/6837.md
+++ b/test/command/6837.md
@@ -14,9 +14,9 @@ Hi
 % pandoc -t markdown+lhs
 # Hi
 ^D
-[WARNING] Rendering heading 'Hi' as a paragraph.
-  ATX headings cannot be used in literate Haskell, because '#' is not
-  allowed in column 1. Consider using --markdown-headings=setext.
+2> [WARNING] Rendering heading 'Hi' as a paragraph.
+2>   ATX headings cannot be used in literate Haskell, because '#' is not
+2>   allowed in column 1. Consider using --markdown-headings=setext.
 Hi
 ```
 
diff --git a/test/command/6873.md b/test/command/6873.md
index 20667d64c..394b53037 100644
--- a/test/command/6873.md
+++ b/test/command/6873.md
@@ -2,7 +2,7 @@
 % pandoc -f latex -t native --citeproc
 \cite[„Etwas […{]} auslassen“]{key}
 ^D
-[WARNING] Citeproc: citation key not found
+2> [WARNING] Citeproc: citation key not found
 [ Para
     [ Cite
         [ Citation
diff --git a/test/command/7099.md b/test/command/7099.md
index 467b22a16..5dcaa64eb 100644
--- a/test/command/7099.md
+++ b/test/command/7099.md
@@ -2,7 +2,7 @@
 % pandoc -f html -t native --verbose
 <iframe src=""></iframe>
 ^D
-[INFO] Skipped '<iframe src></iframe>' at input line 1 column 16
+2> [INFO] Skipped '<iframe src></iframe>' at input line 1 column 16
 []
 ```
 
@@ -10,9 +10,9 @@
 % pandoc -f html -t native --verbose
 <iframe src="h:invalid@url"></iframe>
 ^D
-[INFO] Fetching h:invalid@url...
-[WARNING] Could not fetch resource h:invalid@url: Could not fetch h:invalid@url
-  InvalidUrlException "h:invalid@url" "Invalid scheme"
-[INFO] Skipped '<iframe src="h:invalid@url"></iframe>' at input line 1 column 29
+2> [INFO] Fetching h:invalid@url...
+2> [WARNING] Could not fetch resource h:invalid@url: Could not fetch h:invalid@url
+2>   InvalidUrlException "h:invalid@url" "Invalid scheme"
+2> [INFO] Skipped '<iframe src="h:invalid@url"></iframe>' at input line 1 column 29
 []
 ```
diff --git a/test/command/defaults-inheritance-2.md b/test/command/defaults-inheritance-2.md
index c639655d3..e50332cb0 100644
--- a/test/command/defaults-inheritance-2.md
+++ b/test/command/defaults-inheritance-2.md
@@ -2,4 +2,5 @@
 % pandoc -d command/defaults6 2>&1
 ^D
 Error: Circular defaults file reference in 'command/defaults7.yaml'
+=> 63
 ```
diff --git a/test/command/duplicate_attributes.md b/test/command/duplicate_attributes.md
index b6e8a4c21..4eec0be45 100644
--- a/test/command/duplicate_attributes.md
+++ b/test/command/duplicate_attributes.md
@@ -2,6 +2,6 @@
 % pandoc
 [span]{.foobar style="color:blue" class="zip" style="color:red"}
 ^D
-[WARNING] Ignoring duplicate attribute style="color:red".
+2> [WARNING] Ignoring duplicate attribute style="color:red".
 <p><span class="foobar zip" style="color:blue">span</span></p>
 ```
diff --git a/test/command/nested-table-to-asciidoc-6942.md b/test/command/nested-table-to-asciidoc-6942.md
index baf11fdf7..2b0f13487 100644
--- a/test/command/nested-table-to-asciidoc-6942.md
+++ b/test/command/nested-table-to-asciidoc-6942.md
@@ -67,7 +67,7 @@ The table on level 3 is thus converted to level 2 and a warning is produced
 </body>
 </html>
 ^D
-[INFO] Not rendering Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidth 0.5),(AlignDefault,ColWidth 0.5)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "a1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "2"]]]]] (TableFoot ("",[],[]) [])]]]] (TableFoot ("",[],[]) [])
+2> [INFO] Not rendering Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidth 0.5),(AlignDefault,ColWidth 0.5)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "a1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "2"]]]]] (TableFoot ("",[],[]) [])]]]] (TableFoot ("",[],[]) [])
 [width="100%",cols="50%,50%",]
 |===
 a|
diff --git a/test/command/pandoc-citeproc-356.md b/test/command/pandoc-citeproc-356.md
index b4f998dae..112564f07 100644
--- a/test/command/pandoc-citeproc-356.md
+++ b/test/command/pandoc-citeproc-356.md
@@ -15,6 +15,6 @@ references:
 
 [@bar]
 ^D
-[WARNING] Citeproc: citation bar not found
+2> [WARNING] Citeproc: citation bar not found
 (**bar?**)
 ```
diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md
index 503dfdc91..b9db87722 100644
--- a/test/command/pandoc-citeproc-chicago-author-date.md
+++ b/test/command/pandoc-citeproc-chicago-author-date.md
@@ -47,7 +47,7 @@ References {#references .unnumbered}
 [^3]: Like a citation without author: [-@item1], and now Doe with a
     locator [-@item2 p. 44].
 ^D
-[WARNING] Citeproc: citation nonexistent not found
+2> [WARNING] Citeproc: citation nonexistent not found
 # Pandoc with citeproc-hs
 
 ([**nonexistent?**](#ref-nonexistent))
diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
index e5ab30a52..c05dfda9a 100644
--- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
+++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
@@ -48,7 +48,7 @@ References {#references .unnumbered}
 [^3]: Like a citation without author: [-@item1], and again
     [-@item1], and now Doe with a locator [-@item2 p. 44].
 ^D
-[WARNING] Citeproc: citation nonexistent not found
+2> [WARNING] Citeproc: citation nonexistent not found
 # Pandoc with citeproc-hs
 
 [^1]
diff --git a/test/command/pandoc-citeproc-ieee.md b/test/command/pandoc-citeproc-ieee.md
index bdc7e7150..16a1d7fb1 100644
--- a/test/command/pandoc-citeproc-ieee.md
+++ b/test/command/pandoc-citeproc-ieee.md
@@ -48,7 +48,7 @@ References {#references .unnumbered}
 [^3]: Like a citation without author: [-@item1], and now Doe with a
     locator [-@item2 p. 44].
 ^D
-[WARNING] Citeproc: citation nonexistent not found
+2> [WARNING] Citeproc: citation nonexistent not found
 # Pandoc with citeproc-hs
 
 [**nonexistent?**](#ref-nonexistent)
diff --git a/test/command/svg.md b/test/command/svg.md
index 57c99db33..74a2a1eed 100644
--- a/test/command/svg.md
+++ b/test/command/svg.md
@@ -2,7 +2,7 @@
 % pandoc -f latex -t icml
 \includegraphics{command/corrupt.svg}
 ^D
-[WARNING] Could not determine image size for command/corrupt.svg: could not determine image type
+2> [WARNING] Could not determine image size for command/corrupt.svg: could not determine image type
 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
   <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
     <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">