X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-sendfiles;h=687c5d9b7099ac694759f28aae458f1efc16e138;hb=c6669231a6cb61da7b7ceee7264101948cf1df35;hp=750c760838e27ec18d41f45adca217e5899385d6;hpb=f8baa5a34335fc0fc8ccabfabc601d0af73ab769;p=mmh

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index 750c760..687c5d9 100755
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -17,20 +17,14 @@ fi
 setup_test
 
 expected=$MH_TEST_DIR/$$.expected
-expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
-actual_err=$MH_TEST_DIR/$$.actual_err
 localmbox=`$MH_LIB_DIR/ap -format "%(localmbox)" 0`
 #### Use this script itself for the test file.
 testfiledir="$srcdir/test/post"
 testfile=`basename $0`
 
-(cd "$MH_TEST_DIR"  &&
-mkdir -p tmp  &&
-cat >"$expected_err" <<EOF
-$testfile
-EOF
-)
+(cd "$MH_TEST_DIR"  &&  mkdir -p tmp)
+
 #### Copy fakesendmail and the testfile because we cd to the
 #### test directory, because tar doesn't like absolute paths.
 cp "$srcdir/test/fakesendmail" "$testfiledir/$testfile" "$MH_TEST_DIR"
@@ -54,15 +48,13 @@ test_sendfiles ()
   if [ "$argstyle" = 'new' ]; then
     (cd "$MH_TEST_DIR"  &&
      sendfiles "$@" -to recipient@example.com -subject "sendfiles test" \
-       "$testfile" >/dev/null 2>"$actual_err")
+       "$testfile" >/dev/null 2>&1)
   elif [ "$argstyle" = 'old' ]; then
     (cd "$MH_TEST_DIR"  &&
      sendfiles "$@" recipient@example.com "sendfiles test" \
-       "$testfile" >/dev/null 2>"$actual_err")
+       "$testfile" >/dev/null 2>&1)
   fi
 
-  check "$expected_err" "$actual_err" 'keep first'
-
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="$MH_TEST_DIR"/Mail/fakesendmail.mbox
   inc -silent -file "$mbox"
@@ -88,7 +80,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -112,7 +104,7 @@ run_test 'sendfiles -nonexistent' "Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -127,7 +119,7 @@ Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -139,11 +131,11 @@ Usage: sendfiles [switches] -to recipient \
 # because it will vary with compression method and compressed file
 # size.
 [ "`findprog bzip2`" ]     &&  test_sendfiles 'bzip2 -cd' new -compress bzip2
-[ "`findprog compress`" ]  &&  test_sendfiles uncompress new -compress compress
+[ "`findprog compress`" ]  &&  test_sendfiles 'uncompress -c' new \
+                                              -compress compress
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -compress gzip
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -gzip
 [ "`findprog lzma`" ]      &&  test_sendfiles 'lzma -cd' new -compress lzma
-[ "`findprog zip`" ]       &&  test_sendfiles 'unzip -p' new -compress zip
 
 # check with no compression
 cat >"$expected" <<EOF
@@ -215,8 +207,7 @@ EOF
 
 test_sendfiles cat new -compress none -5
 
-rm -fr "$MH_TEST_DIR/fakesendmail" "$MH_TEST_DIR/$testfile" \
-       "$expected_err" "$MH_TEST_DIR/tmp"
+rm -fr "$MH_TEST_DIR/fakesendmail" "$MH_TEST_DIR/$testfile" "$MH_TEST_DIR/tmp"
 
 
 exit ${failed:-0}