diff options
author | Daiki Ueno <ueno@gnu.org> | 2020-10-03 16:42:07 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2020-10-03 16:42:07 +0000 |
commit | 6f034aa2e9f140626de2b9413715651dffe9e394 (patch) | |
tree | 0a594b8b65bddc9303e1fd6dcc80807e3a79e602 /tests/gnutls-cli-rawpk.sh | |
parent | 12a3bb06a19c78607e9f2a0a59c2e71f43a22b8b (diff) | |
parent | 2c1d544c5d9ad12afec09cc6ede40aa8f4693fd2 (diff) | |
download | gnutls-6f034aa2e9f140626de2b9413715651dffe9e394.tar.gz |
Merge branch 'tmp-sh-tests' into 'master'
tests: simplify shell-script usage
See merge request gnutls/gnutls!1337
Diffstat (limited to 'tests/gnutls-cli-rawpk.sh')
-rwxr-xr-x | tests/gnutls-cli-rawpk.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/gnutls-cli-rawpk.sh b/tests/gnutls-cli-rawpk.sh index 8b60da780e..90fde68c46 100755 --- a/tests/gnutls-cli-rawpk.sh +++ b/tests/gnutls-cli-rawpk.sh @@ -20,9 +20,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE CERTFILE1=rawpk-script1.$$.pem.tmp CERTFILE2=rawpk-script2.$$.pem.tmp @@ -186,7 +186,7 @@ cleanup() echo " * testing server X.509, client RAW" eval "${GETPORT}" -launch_server $$ --echo --x509keyfile ${CERTFILE1} --x509certfile ${CERTFILE1} --priority NORMAL:-CTYPE-CLI-ALL:+CTYPE-CLI-RAWPK --require-client-cert +launch_server --echo --x509keyfile ${CERTFILE1} --x509certfile ${CERTFILE1} --priority NORMAL:-CTYPE-CLI-ALL:+CTYPE-CLI-RAWPK --require-client-cert PID=$! wait_server ${PID} @@ -216,7 +216,7 @@ wait echo " * testing server RAW, client none" eval "${GETPORT}" -launch_server $$ --echo --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK +launch_server --echo --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK PID=$! wait_server ${PID} @@ -247,7 +247,7 @@ wait echo " * testing server RAW, client RAW" eval "${GETPORT}" -launch_server $$ --echo --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK:-CTYPE-CLI-ALL:+CTYPE-CLI-RAWPK --require-client-cert +launch_server --echo --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK:-CTYPE-CLI-ALL:+CTYPE-CLI-RAWPK --require-client-cert PID=$! wait_server ${PID} @@ -279,7 +279,7 @@ wait echo " * testing server X.509+RAW, client none" eval "${GETPORT}" -launch_server $$ --echo --x509keyfile ${CERTFILE1} --x509certfile ${CERTFILE1} --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK +launch_server --echo --x509keyfile ${CERTFILE1} --x509certfile ${CERTFILE1} --rawpkkeyfile ${CERTFILE2} --rawpkfile ${CERTFILE2} --priority NORMAL:+CTYPE-SRV-RAWPK PID=$! wait_server ${PID} |