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/logfile-option.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/logfile-option.sh')
| -rwxr-xr-x | tests/logfile-option.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/logfile-option.sh b/tests/logfile-option.sh index 8cd8f9b53f..e0086dc821 100755 --- a/tests/logfile-option.sh +++ b/tests/logfile-option.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}} unset RETCODE if ! test -x "${SERV}"; then @@ -59,7 +59,7 @@ TMPFILE2=save-data2.$$.tmp OPTS="--sni-hostname example.com --verify-hostname example.com" eval "${GETPORT}" -launch_server $$ --echo --priority NORMAL:+ECDHE-PSK:+DHE-PSK:+PSK --pskpasswd=${PSK} +launch_server --echo --priority NORMAL:+ECDHE-PSK:+DHE-PSK:+PSK --pskpasswd=${PSK} PID=$! wait_server ${PID} @@ -86,7 +86,7 @@ fi rm -f ${TMPFILE1} ${TMPFILE2} eval "${GETPORT}" -launch_server $$ --echo --priority NORMAL:+ECDHE-PSK:+DHE-PSK:+PSK --pskpasswd=${PSK} +launch_server --echo --priority NORMAL:+ECDHE-PSK:+DHE-PSK:+PSK --pskpasswd=${PSK} PID=$! wait_server ${PID} @@ -115,7 +115,7 @@ rm -f ${TMPFILE1} ${TMPFILE2} echo "x509 functionality test" eval "${GETPORT}" -launch_server $$ --echo --sni-hostname-fatal --sni-hostname example.com --x509keyfile ${KEY1} --x509certfile ${CERT1} +launch_server --echo --sni-hostname-fatal --sni-hostname example.com --x509keyfile ${KEY1} --x509certfile ${CERT1} PID=$! wait_server ${PID} @@ -141,7 +141,7 @@ fi rm -f ${TMPFILE1} ${TMPFILE2} eval "${GETPORT}" -launch_server $$ --echo --sni-hostname-fatal --sni-hostname example.com --x509keyfile ${KEY1} --x509certfile ${CERT1} +launch_server --echo --sni-hostname-fatal --sni-hostname example.com --x509keyfile ${KEY1} --x509certfile ${CERT1} PID=$! wait_server ${PID} |