projects
/
edward.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding chinese language (zh)
[edward.git]
/
run-tests
diff --git
a/run-tests
b/run-tests
index 1cf9d71c2d10c60e25ed4789e57dc144cfd26b55..30095eb2b4419eb8440398cac60e49b38e8f336a 100755
(executable)
--- a/
run-tests
+++ b/
run-tests
@@
-17,9
+17,8
@@
# Copyright (C) 2015 Andrew Engelbrecht (AGPLv3+) *
#*************************************************************************
# Copyright (C) 2015 Andrew Engelbrecht (AGPLv3+) *
#*************************************************************************
-NUM_TESTS=1
-#TEST_TYPES="gpg-flatten flatten plain"
-TEST_TYPES="gpg-flatten plain"
+#TEST_TYPES="gpg-flatten flatten gpg-plain"
+TEST_TYPES="gpg-flatten flatten"
function _main {
function _main {
@@
-58,6
+57,7
@@
function _run_test_type {
TESTS_DIR="$SCRIPT_DIR/tests"
G_HOME="$TESTS_DIR/testgnupghome"
EDWARD="$SCRIPT_DIR/edward"
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"
FLATTEN_MIME="$TESTS_DIR/flatten-mime"
ERROR_COUNT="0"
@@
-72,7
+72,7
@@
function _run_test_type {
continue
fi
continue
fi
- ERROR="$("_exec_$TEST_TYPE" "$TEST_NAME" "$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")"
ERROR_COUNT="$(expr "$ERROR_COUNT" + "$ERROR")"
@@
-86,40
+86,44
@@
function _exec_gpg-flatten {
TEST_NAME="$1"
G_HOME="$2"
TEST_EXEC_1="$3"
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_EXEC_2="$5"
+ 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 | "$TEST_EXEC_2" )"
ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
echo "$ERROR"
}
ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
echo "$ERROR"
}
-function _exec_
flatte
n {
+function _exec_
gpg-plai
n {
TEST_NAME="$1"
TEST_NAME="$1"
+ G_HOME="$2"
TEST_EXEC_1="$3"
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" | "$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_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
echo "$ERROR"
}
ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
echo "$ERROR"
}
-function _exec_
plai
n {
+function _exec_
flatte
n {
TEST_NAME="$1"
TEST_EXEC_1="$3"
TEST_NAME="$1"
TEST_EXEC_1="$3"
- TEST_INPUT="$5"
- TEST_OUTPUT="$6"
+ TEST_EXEC_1_OPT="$4"
+ TEST_EXEC_2="$5"
+ TEST_INPUT="$6"
+ TEST_OUTPUT="$7"
- PROGRAM_OUT="$(time "$TEST_EXEC_1"
< "$TEST_INPUT
" )"
+ PROGRAM_OUT="$(time "$TEST_EXEC_1"
"$TEST_EXEC_1_OPT" < "$TEST_INPUT" | "$TEST_EXEC_2
" )"
ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"