X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=run-tests;h=30095eb2b4419eb8440398cac60e49b38e8f336a;hb=c68461f1d6c20adcfd3a9acece871b2d9af928fb;hp=76894e01c8113a0e44a7f225cf2cf5d4e4b75ef8;hpb=33ecbb5eb8bc1d3e7a10ab4097215e9ad07b75a3;p=edward.git

diff --git a/run-tests b/run-tests
index 76894e0..30095eb 100755
--- a/run-tests
+++ b/run-tests
@@ -17,66 +17,129 @@
 # Copyright (C) 2015 Andrew Engelbrecht                     (AGPLv3+)    *
 #*************************************************************************
 
-NUM_TESTS=1
+#TEST_TYPES="gpg-flatten flatten gpg-plain"
+TEST_TYPES="gpg-flatten flatten"
 
 function _main {
 
-    COUNT=$1
-
+    TEST_TYPES="$1"
     SCRIPT_DIR="$(_get_script_dir)"
+
+    _run_all_tests "$SCRIPT_DIR" "$TEST_TYPES"
+}
+
+function _run_all_tests {
+
+    SCRIPT_DIR="$1"
+    TEST_TYPES="$2"
+
+    ERROR_COUNT="0"
+    for TYPE in $TEST_TYPES ; do
+        ERRORS="$(_run_test_type "$SCRIPT_DIR" "$TYPE")"
+
+        ERROR_COUNT="$(expr "$ERROR_COUNT" + "$ERRORS")"
+    done
+
+    if [ "$ERROR_COUNT" -ne "0" ] ; then
+        echo "*** $PROGNAME: FAILED test count: $ERROR_COUNT" >&2
+        exit 1
+    fi
+
+    exit 0
+
+}
+
+function _run_test_type {
+
+    SCRIPT_DIR="$1"
+    TEST_TYPE="$2"
+
     TESTS_DIR="$SCRIPT_DIR/tests"
     G_HOME="$TESTS_DIR/testgnupghome"
     EDWARD="$SCRIPT_DIR/edward"
+    EDWARD_OPT="-p"
     FLATTEN_MIME="$TESTS_DIR/flatten-mime"
 
     ERROR_COUNT="0"
-    for i in $(seq "$COUNT") ; do
+    for TEST_NAME in $(ls $TESTS_DIR/$TEST_TYPE-*.eml) ; do
+
+        TEST_INPUT="$TEST_NAME"
+        TEST_OUTPUT="$(dirname "$TEST_NAME")/$(basename -s .eml "$TEST_NAME").out"
 
-        TEST_INPUT="$TESTS_DIR/gpg-flatten-$i.eml"
-        TEST_OUTPUT="$TESTS_DIR/gpg-flatten-$i.out"
+        if [ ! -f "$TEST_OUTPUT" ] ; then
+            echo "*** $PROGNAME: ERROR: File not found: $TEST_OUTPUT" >&2
+            ERROR_COUNT="$(expr "$ERROR_COUNT" + 1 )"
+            continue
+        fi
 
-        ERROR="$(_exec_gpg_flatten "$i" "$G_HOME" "$EDWARD" "$FLATTEN_MIME" "$TEST_INPUT" "$TEST_OUTPUT")"
+        ERROR="$("_exec_$TEST_TYPE" "$TEST_NAME" "$G_HOME" "$EDWARD" "$EDWARD_OPT" "$FLATTEN_MIME" "$TEST_INPUT" "$TEST_OUTPUT")"
 
         ERROR_COUNT="$(expr "$ERROR_COUNT" + "$ERROR")"
 
     done
 
-    if [ "$ERROR_COUNT" -ne "0" ] ; then
-        echo "*** Failed test count: $ERROR_COUNT" >&2
-        exit 1
-    fi
+    echo "$ERROR_COUNT"
+}
 
-    exit 0
+function _exec_gpg-flatten {
+
+    TEST_NAME="$1"
+    G_HOME="$2"
+    TEST_EXEC_1="$3"
+    TEST_EXEC_1_OPT="$4"
+    TEST_EXEC_2="$5"
+    TEST_INPUT="$6"
+    TEST_OUTPUT="$7"
+
+    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | GNUPGHOME="$G_HOME" gpg 2> /dev/null | "$TEST_EXEC_2" )"
+
+    ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
 
+    echo "$ERROR"
 }
 
-function _exec_gpg_flatten {
+function _exec_gpg-plain {
 
-    TEST_NUM="$1"
+    TEST_NAME="$1"
     G_HOME="$2"
     TEST_EXEC_1="$3"
-    TEST_EXEC_2="$4"
-    TEST_INPUT="$5"
-    TEST_OUTPUT="$6"
+    TEST_EXEC_1_OPT="$4"
+    TEST_INPUT="$6"
+    TEST_OUTPUT="$7"
 
-    PROGRAM_OUT="$(time "$TEST_EXEC_1" < "$TEST_INPUT" | GNUPGHOME="$G_HOME" gpg 2> /dev/null | "$TEST_EXEC_2" )"
+    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | GNUPGHOME="$G_HOME" gpg 2> /dev/null )"
 
-    ERROR="$(_diff "$TEST_NUM" "$TEST_OUTPUT" "$PROGRAM_OUT")"
+    ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
 
     echo "$ERROR"
+}
+
+function _exec_flatten {
+
+    TEST_NAME="$1"
+    TEST_EXEC_1="$3"
+    TEST_EXEC_1_OPT="$4"
+    TEST_EXEC_2="$5"
+    TEST_INPUT="$6"
+    TEST_OUTPUT="$7"
 
+    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | "$TEST_EXEC_2" )"
+
+    ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
+
+    echo "$ERROR"
 }
 
 function _diff {
 
-    TEST_NUM="$1"
+    TEST_NAME="$1"
     TEST_OUT="$2"
     PROGRAM_OUT="$3"
 
     OUT_DIFF="$(echo "$PROGRAM_OUT" | diff -u "$TEST_OUT" - )"
 
     if [ -n "$OUT_DIFF" ] ; then
-        echo "*** TEST $TEST_NUM FAILED! Output difference:" >&2
+        echo "*** $PROGNAME: TEST $(basename "$TEST_NAME") FAILED! Output difference:" >&2
         echo "$OUT_DIFF" >&2
 
         echo -n "1"
@@ -93,8 +156,9 @@ function _get_script_dir {
     SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
     echo -n "$SCRIPT_DIR"
-
 }
 
-_main $NUM_TESTS
+PROGNAME="$(basename $0)"
+
+_main "$TEST_TYPES"