Tune compat.sh and ssl-opt.sh error reporting

This commit is contained in:
Manuel Pégourié-Gonnard 2014-03-25 14:16:44 +01:00 committed by Paul Bakker
parent 244c06ee02
commit e01af4cd37
2 changed files with 6 additions and 4 deletions

View File

@ -679,8 +679,8 @@ run_client() {
# announce what we're going to do
let "tests++"
VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2 "
echo -n "$TITLE"
TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2"
echo -n "$TITLE "
LEN=`echo "$TITLE" | wc -c`
LEN=`echo 72 - $LEN | bc`
for i in `seq 1 $LEN`; do echo -n '.'; done; echo -n ' '
@ -757,6 +757,8 @@ run_client() {
;;
esac
echo "EXIT: $EXIT" >> cli_out
# report and count result
case $RESULT in
"0")
@ -768,8 +770,6 @@ run_client() {
;;
"2")
echo FAIL
echo " ! $SERVER_CMD"
echo " ! $CLIENT_CMD"
cp srv_out c-srv-${tests}.log
cp cli_out c-cli-${tests}.log
echo " ! outputs saved to c-srv-${tests}.log, c-cli-${tests}.log"

View File

@ -135,6 +135,8 @@ run_test() {
echo "$CLI_CMD" > cli_out
$SHELL -c "$CLI_CMD" >> cli_out 2>&1
CLI_EXIT=$?
echo "EXIT: $CLI_EXIT" >> cli_out
if is_polar "$SRV_CMD"; then
"$P_CLI" request_page=SERVERQUIT tickets=0 auth_mode=none \
crt_file=data_files/cli2.crt key_file=data_files/cli2.key \