X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=test%2Ftest_all;h=02329d56776fd37631558e53aab9dab50ad1a5b5;hb=0d9cead275145c7e37e9acc6c1bd62bbbfd09f2e;hp=ff48accad783f89f20e6d346db5a5b42091ff2c1;hpb=2478edc3fbaac6f9aa62f17af1e18c0b7e4510f0;p=mimedecode.git

diff --git a/test/test_all b/test/test_all
index ff48acc..02329d5 100755
--- a/test/test_all
+++ b/test/test_all
@@ -1,25 +1,40 @@
 #! /bin/sh
 
 cd "`dirname \"$0\"`" &&
+rm -rf save tmp &&
+mkdir tmp || exit 1
+
+LC_CTYPE=c.UTF-8 &&
+export LC_CTYPE &&
+
 MAILCAPS="`pwd`"/.mailcap &&
 export MAILCAPS &&
 
-rm -rf save tmp &&
-mkdir tmp || exit 1
+test -r "$HOME"/.mime.types || cp -p .mime.types "$HOME"/.mime.types &&
 
+: ${PYTHON:=python}
 RC=0
 
+if [ `$PYTHON -c "import sys; print(sys.version[0])"` -eq 2 ]; then
+   PY3=NO
+else
+   PY3=YES
+fi
+
 test1() {
    infile="$1"
    shift
    expfile="$1"
+   if [ $PY3 = YES -a -f expected/"$expfile"-py3 ]; then
+      expfile="$expfile"-py3
+   fi
    shift
 
-   ../mimedecode.py -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
+   mimedecode -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/"$expfile" tmp/"$expfile" >tmp/"$expfile".diff
+      diff --text expected/"$expfile" tmp/"$expfile" | tee tmp/"$expfile".diff
       return 1
    fi
 }
@@ -61,6 +76,7 @@ test_file msg_02.txt msg_02-1.txt --set-param=X-Mailer:test:set
 test_file msg_13.txt msg_13-1.txt -B '*/*'
 test_file msg_13.txt msg_13.txt -t 'text/*' -b 'image/*' -B '*/*'
 test_file msg_36.txt msg_36-1.txt -i multipart/alternative
+test_file msg_36.txt msg_36-2.txt -I multipart/alternative
 
 # Test --save-*
 test2() {
@@ -78,6 +94,8 @@ test2() {
    if cmp -s expected-save/"$expsavefile" save/"$savefile"; then
       rm save/"$savefile" && return 0 || return 1
    else
+      ls -lAF save/
+      diff --text expected-save/"$expsavefile" save/"$savefile" | tee save/"$expsavefile".diff
       return 1
    fi
 }
@@ -96,9 +114,17 @@ test_save msg_07.txt msg_07.txt 1-dingusfish.gif msg_07-2.txt --save-body image/
 test_save msg_07.txt msg_07.txt 1-dingusfish.gif msg_07-3.txt --save-message image/gif
 test_save msg_07-1.txt msg_07-1.txt 1-dingusfish.gif msg_07-4.txt --save-message image/gif
 
+test_save msg_07.txt msg_07.txt 1.dig msg_07-5.txt --save-headers multipart/mixed
+test_save msg_07.txt msg_07.txt 1.dig msg_07-6.txt --save-body multipart/mixed
+test_save msg_07.txt msg_07.txt 1.dig msg_07-7.txt --save-message multipart/mixed
+
+echo
+
 if [ "$RC" -eq 0 ]; then
    echo "All tests passed!"
    rmdir save tmp
+else
+   echo "ERRORS!"
 fi
 
 exit $RC