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/suite/testcompat-oldgnutls.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/suite/testcompat-oldgnutls.sh')
| -rwxr-xr-x | tests/suite/testcompat-oldgnutls.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/suite/testcompat-oldgnutls.sh b/tests/suite/testcompat-oldgnutls.sh index 937bf57050..b8700a7300 100755 --- a/tests/suite/testcompat-oldgnutls.sh +++ b/tests/suite/testcompat-oldgnutls.sh @@ -30,9 +30,9 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -abs_top_srcdir="${abs_top_srcdir:-$(pwd)/../../}" -srcdir="${srcdir:-.}" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${abs_top_srcdir=$(pwd)/../../} +: ${srcdir=.} +: ${CLI=../../src/gnutls-cli${EXEEXT}} TMPFILE=testcompat-oldgnutls.$$.tmp # This assumes a root directory in /usr/local/OLDGNUTLS containing the @@ -58,7 +58,7 @@ skip_if_no_datefudge . "${srcdir}/testcompat-common" -PORT="${PORT:-${RPORT}}" +: ${PORT=${RPORT}} SERV=/usr/local/OLDGNUTLS/usr/bin/gnutls-serv @@ -86,7 +86,7 @@ run_client_suite() { fi eval "${GETPORT}" - LD_LIBRARY_PATH=$LDPATH launch_server $$ --priority "NORMAL:+SHA256${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}" + LD_LIBRARY_PATH=$LDPATH launch_server --priority "NORMAL:+SHA256${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}" PID=$! wait_server ${PID} @@ -150,7 +150,7 @@ run_server_suite() { fi eval "${GETPORT}" - launch_server $$ --priority "NORMAL:+SHA256${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}" + launch_server --priority "NORMAL:+SHA256${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}" PID=$! wait_server ${PID} |