X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=test%2Ftest_all;h=3de6ec74fb0daf91ff740250d7d3a1c261693640;hb=8bd291ec4b0e8ae1a981194ccc9b4d0388ec2cea;hp=81b71eae7bafe16b1c12367b69e4a61512b4c517;hpb=ead19115d233af78b742744c1e897f719b5a8666;p=mimedecode.git

diff --git a/test/test_all b/test/test_all
index 81b71ea..3de6ec7 100755
--- a/test/test_all
+++ b/test/test_all
@@ -10,26 +10,38 @@ mkdir tmp || exit 1
 RC=0
 
 test1() {
-   ../mimedecode.py -H test -f utf-8 input/"$1" >tmp/"$1" || return 1
-   if cmp -s expected/"$1" tmp/"$1"; then
-      rm tmp/"$1" && return 0 || return 1
+   infile="$1"
+   shift
+   expfile="$1"
+   shift
+
+   ../mimedecode.py -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
+   if cmp -s expected/"$expfile" tmp/"$expfile"; then
+      rm tmp/"$expfile" && return 0 || return 1
    else
-      diff --text expected/"$1" tmp/"$1" >tmp/"$1".diff
+      diff --text expected/"$expfile" tmp/"$expfile" >tmp/"$expfile".diff
       return 1
    fi
 }
 
-for f in input/*.txt; do
-   n="`basename \"$f\"`"
-   echo -n "$n "
-   if test1 "$n"; then
+test_file() {
+   echo -n "$2 "
+   if test1 "$@"; then
       echo "ok"
    else
       echo "fail"
       RC=1
    fi
+}
+
+for f in input/*.txt; do
+   n="`basename \"$f\"`"
+   test_file "$n" "$n"
 done
 
+test_file msg_15.txt msg_15-1.txt -b text/html
+test_file msg_15.txt msg_15-2.txt -i text/html
+
 if [ "$RC" -eq 0 ]; then
    echo "All tests passed!"
    rmdir tmp