Merge pull request #2869 from JacobBarthelmeh/Testing
add single quotes around -? in test scripts
This commit is contained in:
commit
93fd1b1eeb
@ -161,13 +161,13 @@ server=login.live.com
|
||||
ca=certs/external/baltimore-cybertrust-root.pem
|
||||
|
||||
[ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
|
||||
./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!'
|
||||
./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# check if supported key size is large enough to handle 4096 bit RSA
|
||||
size=`./examples/client/client -? | grep "Max RSA key"`
|
||||
size=`./examples/client/client '-?' | grep "Max RSA key"`
|
||||
size=`echo ${size//[^0-9]/}`
|
||||
if [ ! -z "$size" ]; then
|
||||
printf 'check on max key size of %d ...' $size
|
||||
@ -231,7 +231,7 @@ RESULT=$?
|
||||
|
||||
# Test with example server
|
||||
|
||||
./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!'
|
||||
./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -177,7 +177,7 @@ trap cleanup EXIT INT TERM HUP
|
||||
[ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
|
||||
|
||||
# check if supported key size is large enough to handle 4096 bit RSA
|
||||
size=`./examples/client/client -? | grep "Max RSA key"`
|
||||
size=`./examples/client/client '-?' | grep "Max RSA key"`
|
||||
size=`echo ${size//[^0-9]/}`
|
||||
if [ ! -z "$size" ]; then
|
||||
printf 'check on max key size of %d ...' $size
|
||||
|
@ -62,11 +62,11 @@ do_trap() {
|
||||
trap do_trap INT TERM
|
||||
|
||||
[ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
|
||||
./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!'
|
||||
./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!'
|
||||
./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -49,7 +49,7 @@ do_test() {
|
||||
#make sure we support session resumption (!NO_SESSION_CACHE)
|
||||
# Check the client for the extended master secret disable option. If
|
||||
# present we need to run the test twice.
|
||||
options_check=`./examples/client/client -?`
|
||||
options_check=`./examples/client/client '-?'`
|
||||
case "$options_check" in
|
||||
*$resume_sup_string*)
|
||||
echo -e "\nResume test supported";;
|
||||
@ -111,15 +111,15 @@ do_test() {
|
||||
|
||||
trap do_trap INT TERM
|
||||
|
||||
./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!'
|
||||
./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!'
|
||||
if [ $? -ne 0 ]; then
|
||||
./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!'
|
||||
./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!'
|
||||
if [ $? -ne 0 ]; then
|
||||
RUN_TEST="Y"
|
||||
fi
|
||||
fi
|
||||
|
||||
./examples/client/client -? 2>&1 | grep -- 'Resume session'
|
||||
./examples/client/client '-?' 2>&1 | grep -- 'Resume session'
|
||||
if [ $? -ne 0 ]; then
|
||||
RUN_TEST="Y"
|
||||
fi
|
||||
|
@ -70,11 +70,11 @@ do_trap() {
|
||||
trap do_trap INT TERM
|
||||
|
||||
[ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
|
||||
./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!'
|
||||
./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!'
|
||||
./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!'
|
||||
if [ $? -eq 0 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user