diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-17 13:37:54 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-17 13:37:54 +0000 |
| commit | a1c84d3e19060fc69006e07109805ffbd50a2ef2 (patch) | |
| tree | c82d972b3e74c4f12b502a9200901f197408103c | |
| parent | 7a1eed1befab3ea49667bdd24eabe3e5262ec77d (diff) | |
| parent | f497ded19ee660ed52c7f9c210c90eb8a40810b6 (diff) | |
| download | gnutls-a1c84d3e19060fc69006e07109805ffbd50a2ef2.tar.gz | |
Merge branch 'tmp-ametzler-1091-gost' into 'master'
Fix and enable GOST test in tests/gnutls-cli-debug.sh
See merge request gnutls/gnutls!1328
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rwxr-xr-x | tests/gnutls-cli-debug.sh | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 0387bf7389..ec5ec3f505 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -607,6 +607,13 @@ else TESTS_ENVIRONMENT += ENABLE_SSL3=0 endif +if ENABLE_GOST +TESTS_ENVIRONMENT += ENABLE_GOST=1 +else +TESTS_ENVIRONMENT += ENABLE_GOST=0 +endif + + if WANT_TEST_SUITE LOG_COMPILER = $(VALGRIND) diff --git a/tests/gnutls-cli-debug.sh b/tests/gnutls-cli-debug.sh index 3351764216..2a1738cc6e 100755 --- a/tests/gnutls-cli-debug.sh +++ b/tests/gnutls-cli-debug.sh @@ -207,7 +207,7 @@ if test "${ENABLE_GOST}" = "1" && test "${GNUTLS_FORCE_FIPS_MODE}" != 1 ; then echo "Checking output of gnutls-cli-debug for GOST-enabled server" eval "${GETPORT}" - launch_server $$ --echo --priority "NORMAL" --x509keyfile ${KEY4} --x509certfile ${CERT4} >/dev/null 2>&1 + launch_server $$ --echo --priority "NORMAL:+GOST" --x509keyfile ${KEY4} --x509certfile ${CERT4} >/dev/null 2>&1 PID=$! wait_server ${PID} |