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/system-override-default-priority-string.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/system-override-default-priority-string.sh')
-rwxr-xr-x | tests/system-override-default-priority-string.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/system-override-default-priority-string.sh b/tests/system-override-default-priority-string.sh index b0c963bb9c..da262c8542 100755 --- a/tests/system-override-default-priority-string.sh +++ b/tests/system-override-default-priority-string.sh @@ -19,12 +19,12 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -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}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp -STOCK_PRIORITY="${GNUTLS_SYSTEM_PRIORITY_FILE:-./system.prio}" +STOCK_PRIORITY="${GNUTLS_SYSTEM_PRIORITY_FILE-./system.prio}" export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 if ! test -x "${SERV}"; then @@ -48,7 +48,7 @@ CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem # Try whether a client connection with priority string None succeeds export GNUTLS_SYSTEM_PRIORITY_FILE="${srcdir}/system-override-default-priority-string.none.config" eval "${GETPORT}" -launch_server $$ --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} +launch_server --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} PID=$! wait_server ${PID} @@ -61,7 +61,7 @@ wait # Try whether a client connection to an tls1.3 only server succeeds export GNUTLS_SYSTEM_PRIORITY_FILE="${srcdir}/system-override-default-priority-string.only-tls13.config" eval "${GETPORT}" -launch_server $$ --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} +launch_server --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} PID=$! wait_server ${PID} @@ -80,7 +80,7 @@ wait export GNUTLS_SYSTEM_PRIORITY_FILE="${srcdir}/system-override-default-priority-string.bad.config" unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID eval "${GETPORT}" -launch_server $$ --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} +launch_server --echo --x509keyfile ${KEY1} --x509certfile ${CERT1} PID=$! wait_server ${PID} |