diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-09-27 00:42:21 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-09-27 02:21:16 +0300 |
| commit | d5a3e18f146917428e284c7c346426696844af6e (patch) | |
| tree | fb4f0f8e7d58e09e4764bd19b3c4fea8745981c9 | |
| parent | 4eb09b0b1d6d1e6bd747668577cd2c7c367abb2f (diff) | |
| download | gnutls-d5a3e18f146917428e284c7c346426696844af6e.tar.gz | |
tlsfuzzer: support running from separate build dir
Adapt tls-fuzzer-common.sh script to be able to run tests in case
srcdir != builddir.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
| -rwxr-xr-x | tests/suite/tls-fuzzer/tls-fuzzer-common.sh | 17 | ||||
| -rwxr-xr-x | tests/suite/tls-fuzzer/tls-fuzzer-psk.sh | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-common.sh b/tests/suite/tls-fuzzer/tls-fuzzer-common.sh index cb44656220..111fd44970 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-common.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-common.sh @@ -18,23 +18,23 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -SERV="../../../../src/gnutls-serv${EXEEXT}" -CLI="../../../../src/gnutls-cli${EXEEXT}" +builddir=`pwd` +CLI="${builddir}/../../src/gnutls-cli${EXEEXT}" +SERV="${builddir}/../../src/gnutls-serv${EXEEXT}" -TMPFILE=tls-fuzzer.$$.tmp -PSKFILE=tls-fuzzer.psk.$$.tmp +TMPFILE="${builddir}/tls-fuzzer.$$.tmp" +PSKFILE="${builddir}/tls-fuzzer.psk.$$.tmp" . "${srcdir}/../scripts/common.sh" eval "${GETPORT}" -pushd tls-fuzzer - -if ! test -d tlsfuzzer;then +if ! test -d "${srcdir}/tls-fuzzer/tlsfuzzer" ; then exit 77 fi -pushd tlsfuzzer +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 @@ -51,6 +51,5 @@ rm -f ${TMPFILE} [ -f "${PSKFILE}" ] && rm -f ${PSKFILE} popd -popd exit $retval diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh b/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh index cc2e6df0d4..aeefae9a5e 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh @@ -26,7 +26,7 @@ PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:-KX-ALL:+DHE-P PSKKEY=8a7759b3f26983c453e448060bde8981 PSKID=test -sed -e "s|@SERVER@|$SERV|g" -e "s/@PSKKEY@/$PSKKEY/g" -e "s/@PSKID@/$PSKID/g" -e "s/@PSKFILE@/$PSKFILE/g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-psk.json >${TMPFILE} +sed -e "s|@SERVER@|$SERV|g" -e "s/@PSKKEY@/$PSKKEY/g" -e "s/@PSKID@/$PSKID/g" -e "s^@PSKFILE@^$PSKFILE^g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-psk.json >${TMPFILE} cat >${PSKFILE} <<_EOF_ ${PSKID}:${PSKKEY} |