diff options
author | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-01-27 08:39:22 +0000 |
---|---|---|
committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2020-01-27 08:39:22 +0000 |
commit | 25eb1dfa7a84b4fe465c4fe333f95e6eb8a9325f (patch) | |
tree | 5163e5a21c4a5610cc25c36f1e0a612d651e718a | |
parent | 4a841c300e7902e817598d30654e4c9763c06b84 (diff) | |
parent | 9ac41f0bc27bfbee595f4cb6d74fae9364ad35ce (diff) | |
download | gnutls-25eb1dfa7a84b4fe465c4fe333f95e6eb8a9325f.tar.gz |
Merge branch 'tmp-20200126-bashismintest' into 'master'
Avoid pushd/popd bashism in testsuite
See merge request gnutls/gnutls!1180
-rwxr-xr-x | tests/suite/multi-ticket-reception.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/suite/multi-ticket-reception.sh b/tests/suite/multi-ticket-reception.sh index 63de24e904..d84367703c 100755 --- a/tests/suite/multi-ticket-reception.sh +++ b/tests/suite/multi-ticket-reception.sh @@ -48,10 +48,10 @@ KEY1=${srcdir}/tls-fuzzer/tlslite-ng/tests/serverX509Key.pem CERT1=${srcdir}/tls-fuzzer/tlsfuzzer/tests/serverX509Cert.pem #create links necessary for tlslite to function -pushd "${srcdir}/tls-fuzzer/tlsfuzzer" -test -L ecdsa || ln -s ../python-ecdsa/src/ecdsa ecdsa -test -L tlslite || ln -s ../tlslite-ng/tlslite tlslite 2>/dev/null -popd +test -L "${srcdir}/tls-fuzzer/tlsfuzzer/ecdsa" || \ + ln -s ../python-ecdsa/src/ecdsa "${srcdir}/tls-fuzzer/tlsfuzzer/" +test -L "${srcdir}/tls-fuzzer/tlsfuzzer/tlslite" || \ + ln -s ../tlslite-ng/tlslite "${srcdir}/tls-fuzzer/tlsfuzzer/" echo "Checking whether receiving 1 ticket succeeds (sanity)" |