diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-04-09 11:51:34 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-04-09 13:05:11 +0200 |
| commit | 6bca68a43db9856451e860aa814a3dd3a0148885 (patch) | |
| tree | 0b59721270baff0a80645aa181258bac2ef3601c | |
| parent | 3957f2a7eef05647e4a9065860537d9904e8a225 (diff) | |
| download | gnutls-6bca68a43db9856451e860aa814a3dd3a0148885.tar.gz | |
tests: disable unsupported curves from compatibility checks
This allows running make check even when compiling with disable-suiteb-curves.
| -rw-r--r-- | tests/suite/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/suite/testcompat-openssl.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 6f2c9e8f41..43c5403526 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -100,6 +100,10 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ top_builddir="$(top_builddir)" \ srcdir="$(srcdir)" +if ENABLE_NON_SUITEB_CURVES +TESTS_ENVIRONMENT += ENABLE_NON_SUITEB_CURVES=1 +endif + if ENABLE_DANE nodist_check_SCRIPTS += testdane.sh endif diff --git a/tests/suite/testcompat-openssl.sh b/tests/suite/testcompat-openssl.sh index d7f9cc0e02..57259c9db5 100755 --- a/tests/suite/testcompat-openssl.sh +++ b/tests/suite/testcompat-openssl.sh @@ -38,7 +38,7 @@ if ! test -x /usr/bin/openssl; then fi /usr/bin/openssl version|grep fips >/dev/null 2>&1 -if test $? = 0; then +if test $? = 0 || test "${ENABLE_NON_SUITEB_CURVES}" != "1"; then export FIPS=1 else export FIPS=0 |