summaryrefslogtreecommitdiff
path: root/tests/system-override-versions.sh
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2020-10-03 16:42:07 +0000
committerDaiki Ueno <ueno@gnu.org>2020-10-03 16:42:07 +0000
commit6f034aa2e9f140626de2b9413715651dffe9e394 (patch)
tree0a594b8b65bddc9303e1fd6dcc80807e3a79e602 /tests/system-override-versions.sh
parent12a3bb06a19c78607e9f2a0a59c2e71f43a22b8b (diff)
parent2c1d544c5d9ad12afec09cc6ede40aa8f4693fd2 (diff)
downloadgnutls-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-versions.sh')
-rwxr-xr-xtests/system-override-versions.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/system-override-versions.sh b/tests/system-override-versions.sh
index e5191e2aeb..a9999cce0c 100755
--- a/tests/system-override-versions.sh
+++ b/tests/system-override-versions.sh
@@ -20,9 +20,9 @@
# 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
export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
@@ -73,7 +73,7 @@ CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
unset GNUTLS_SYSTEM_PRIORITY_FILE
eval "${GETPORT}"
-launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+launch_server --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3" --x509keyfile ${KEY1} --x509certfile ${CERT1}
PID=$!
wait_server ${PID}
@@ -91,7 +91,7 @@ KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
eval "${GETPORT}"
-launch_server $$ --echo --priority "NORMAL" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+launch_server --echo --priority "NORMAL" --x509keyfile ${KEY1} --x509certfile ${CERT1}
PID=$!
wait_server ${PID}