diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-05-24 10:25:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-06-01 14:38:41 +1000 |
| commit | 07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1 (patch) | |
| tree | c6c6ce84f820fd07824bf4f01ce6a84592acea69 /regress/test-exec.sh | |
| parent | 1a4d1da9188d7c88f646b61f0d6a3b34f47c5439 (diff) | |
| download | openssh-git-07660b3c99f8ea74ddf4a440e55c16c9f7fb3dd1.tar.gz | |
upstream: Find openssl binary via environment variable. This
allows overriding if necessary (eg in -portable where we're testing against a
specific version of OpenSSL).
OpenBSD-Regress-ID: 491f39cae9e762c71aa4bf045803d077139815c5
Diffstat (limited to 'regress/test-exec.sh')
| -rw-r--r-- | regress/test-exec.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index bc59ebdd..fd749f7e 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.79 2021/04/06 23:57:56 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.80 2021/05/24 10:25:18 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -100,6 +100,7 @@ CONCH=conch # Tools used by multiple tests NC=$OBJ/netcat +OPENSSL=openssl if [ "x$TEST_SSH_SSH" != "x" ]; then SSH="${TEST_SSH_SSH}" @@ -155,6 +156,9 @@ fi if [ "x$TEST_SSH_SK_HELPER" != "x" ]; then SSH_SK_HELPER="${TEST_SSH_SK_HELPER}" fi +if [ "x$TEST_SSH_OPENSSL" != "x" ]; then + OPENSSL="${TEST_SSH_OPENSSL}" +fi # Path to sshd must be absolute for rexec case "$SSHD" in |