sbr/oauth.c: Remove const to avoid curl's debug_callback warning.

[nmh] / test / whom / test-whom

diff --git a/test/whom/test-whom b/test/whom/test-whom
index b3f20eb634be0566679cc7657428306c87ac402c..e8341a5400bdba9a2d89ba62a7fc1abe32178e27 100755 (executable)
--- a/test/whom/test-whom
+++ b/test/whom/test-whom
@@ -19,6 +19,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' whom -
+
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
@@ -33,6 +35,8 @@ This is a draft message.
 EOF
 
 # check -help
+# Only look at first 10 lines because the rest depend on
+# whether sasl support was configured in.
 cat >$expected <<EOF
 Usage: whom [switches] [file]
   switches are:
@@ -44,13 +48,9 @@ Usage: whom [switches] [file]
   -nodraftfolder
   -version
   -help
-  -sasl
-  -saslmech mechanism
-  -user username
-  -(port) server port name/number
 EOF
 
-whom -help >$actual 2>&1
+run_prog whom -help | head -10 >$actual 2>&1
 check $expected $actual
 
 # check -version