X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=test%2Ftest_all;h=02329d56776fd37631558e53aab9dab50ad1a5b5;hb=e7a97d925f692e1340017f96d04e3535dc6f532d;hp=b05f3834eb03f335c3b62e828a3576430f5526f7;hpb=5c827bf076452564b9e052a22888675fa7678736;p=mimedecode.git

diff --git a/test/test_all b/test/test_all
index b05f383..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
 
-   $PYTHON ../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
 }
@@ -79,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
 }