test: Send command's stderr down pipe; don't discard.

Fixes 880ff2a4 that turned `foo >$actual 2>&1' into
`foo | sed ... >$actual 2>&1'.

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 019f329ad0fdf7a616b55f6f4bb110e2da14c9d6..dad6c7007d87067877bc6c8a78bbefdab651488d 100755 (executable)
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -45,7 +45,7 @@ Usage: ali [switches] aliases ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-ali -help | sed '/^$/,$d' >"$actual" 2>&1
+ali -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/anno/test-anno b/test/anno/test-anno
index 89204ccb259cb29ee6652e7495b7491cefa9c495..008c34192a74492e615b08d3e5f9e78da4d637ba 100755 (executable)
--- a/test/anno/test-anno
+++ b/test/anno/test-anno
@@ -59,7 +59,7 @@ Usage: anno [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog anno -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog anno -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 496986f5e011cad8a8ffda3b6ad13fdfb0cd8764..d3f6279eea6972445a1caa8b3268971ab062327b 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -94,7 +94,7 @@ Usage: dist [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-dist -help | sed '/^$/,$d' >"$actual" 2>&1
+dist -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/folder/test-packf b/test/folder/test-packf
index a839dc8efdb4b37796cd29b6c6737e0f32eb0650..1db6965c2f7e209e0a4f728add2a4037ef2db67b 100755 (executable)
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -34,7 +34,7 @@ Usage: packf [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-packf -help | sed '/^$/,$d' >"$actual" 2>&1
+packf -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/folder/test-sortm b/test/folder/test-sortm
index a136faaa14d37f55e08e9f278d5285e13ffecd04..491bf5cff42683252038cb579eb0fcb87aa67882 100755 (executable)
--- a/test/folder/test-sortm
+++ b/test/folder/test-sortm
@@ -40,7 +40,7 @@ Usage: sortm [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog sortm -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog sortm -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/format/test-dp b/test/format/test-dp
index 7805d0bf9c039414fbfa57bde83f49b7c64b5c5a..09d47f8cac647bacbced33a68564d340270fdc3d 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -48,7 +48,7 @@ Usage: dp [switches] dates ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$dp" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 82791f48ba30a48aff329cddf62dfffa1cba7223..0e723dce0d17d873442b77429e9387cbd030d7e9 100755 (executable)
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -59,7 +59,7 @@ Usage: fmtdump [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-"$fmtdump" -help | sed '/^$/,$d' >"$actual" 2>&1
+"$fmtdump" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index b927b95e694525d0fa0415a8d1811675f4209f4e..138c505123996551aed61b898dddeeca992abe1a 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -73,7 +73,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog mhfixmsg -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

diff --git a/test/mhical/test-mhical b/test/mhical/test-mhical
index ad51b09c6cd04d1ee351602e21ceb94a977de530..72c55f5de4fe379a79ca1c46cc6d6bb8ab3a8dd6 100755 (executable)
--- a/test/mhical/test-mhical
+++ b/test/mhical/test-mhical
@@ -49,7 +49,7 @@ Usage: mhical [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhical -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog mhical -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index 2e7375f0b6e087f9e9dae3542bdcd99bdca86c00..cd85b95c0cad001413984889780f09d073fad71a 100755 (executable)
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -89,7 +89,7 @@ Usage: mhmail [-t(o)] addrs ... [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-mhmail -help | sed '/^$/,$d' >"$actual" 2>&1
+mhmail -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index b532183dcce8bf0758cb54580d734b81799af6b6..1470cbaa8feca605ed5032ff01d7deaef2f50f55 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -38,7 +38,7 @@ Usage: mhparam [profile-components] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-mhparam -help | sed '/^$/,$d' >"$actual" 2>&1
+mhparam -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index e7209ce3865da2e8daa4ddec775bcead06854ea9..c6521ce3d0181e122641c9a5aadff69b55b76c49 100755 (executable)
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -31,7 +31,7 @@ Usage: mhpath [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog mhpath -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog mhpath -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp
index 8e0eb83098adc851178bf6378e84b978610d26b8..2ff99f22c6f8367a651547108ab4e2a714b93d4f 100755 (executable)
--- a/test/mkstemp/test-mkstemp
+++ b/test/mkstemp/test-mkstemp
@@ -51,7 +51,7 @@ else
 fi
 
 #### Skip nmh intro text.
 fi
 
 #### Skip nmh intro text.

-run_prog $mkstemp -h | sed '/^$/,$d' >"$actual" 2>&1
+run_prog $mkstemp -h 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index 3e55b1ec12c17a6899c453869ce7deb65e2477b9..bc93c3139c40388e0db9442cb12cbee817704053 100755 (executable)
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -90,7 +90,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog sendfiles -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog sendfiles -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index 65ed8a96ddf02b31de9f1333d574e90e531d77e7..43739b7401c26873e58eddf45b7b1963399557de 100755 (executable)
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -38,7 +38,7 @@ Usage: prompter [switches] file
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog prompter -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog prompter -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 7ac0087cf3c0755088586fc4d10e83aeac80febe..bdc32f7604b133371fd0f90a92f4b0ea79c2ed47 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -40,7 +40,7 @@ Usage: rcvdist [switches] [switches for postproc] address ...
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvdist" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$rcvdist" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index a780c253c84b0714ff5b371f9eee518f9dd7fc0e..ebae2286f8f99b62fe42023fb1faac221f5539b6 100755 (executable)
--- a/test/rcv/test-rcvpack
+++ b/test/rcv/test-rcvpack
@@ -36,7 +36,7 @@ Usage: rcvpack [switches] file
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvpack" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$rcvpack" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 48bf8c1bb5387b4bceacac95006941f2384cf84f..d2844df0368cb2f9fbca205d453581808e3196c3 100755 (executable)
--- a/test/rcv/test-rcvstore
+++ b/test/rcv/test-rcvstore
@@ -41,7 +41,7 @@ Usage: rcvstore [+folder] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvstore" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$rcvstore" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty
index a2cf6ca63728e56ba1b601f72515e6e372daaafd..fdc74d44649545708d131b0aad9abb2ad598e06a 100755 (executable)
--- a/test/rcv/test-rcvtty
+++ b/test/rcv/test-rcvtty
@@ -40,7 +40,7 @@ Usage: rcvtty [command ...]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog "$rcvtty" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$rcvtty" -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/repl/test-repl b/test/repl/test-repl
index c406b009252afc2c820b39c4c7505f484deb14e7..2e5bef2c96ff8df08f75c19a97e7477fd9d003c0 100755 (executable)
--- a/test/repl/test-repl
+++ b/test/repl/test-repl
@@ -59,7 +59,7 @@ Usage: repl: [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog repl -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog repl -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal
index 1213117b00fc39e2dfdeb910cf77cc4ca0650e14..8eaa2255e264e69e8bba338a6d924f145d529eff 100755 (executable)
--- a/test/slocal/test-slocal
+++ b/test/slocal/test-slocal
@@ -45,7 +45,7 @@ Usage: slocal [switches]
 EOF
 
 #### Skip nmh intro text.
 EOF
 
 #### Skip nmh intro text.

-run_prog $slocal -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog $slocal -help 2>&1 | sed '/^$/,$d' >"$actual"

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version