From: Nikos Mavrogiannopoulos Date: Thu, 26 Nov 2015 10:23:15 +0000 (+0100) Subject: tests: override-ciphers will not run mac tests on windows X-Git-Tag: gnutls_3_5_0~515 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e5fcb74b006972cd07a69faf91217bf5f1d0436;p=thirdparty%2Fgnutls.git tests: override-ciphers will not run mac tests on windows There is some issue with symbols for self tests not being exported. --- diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am index 0c27a91480..4e34ba1896 100644 --- a/tests/slow/Makefile.am +++ b/tests/slow/Makefile.am @@ -57,3 +57,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ LC_ALL="C" \ top_builddir="$(top_builddir)" \ srcdir="$(srcdir)" + +if WINDOWS +TESTS_ENVIRONMENT += WINDOWS=1 +endif diff --git a/tests/slow/override-ciphers b/tests/slow/override-ciphers index 6a255c8e77..a95253ba94 100755 --- a/tests/slow/override-ciphers +++ b/tests/slow/override-ciphers @@ -47,18 +47,23 @@ if test $ret != 0; then exit $ret fi -GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ./mac-override -ret=$? -if test $ret != 0; then - echo "overriden mac tests failed" - exit $ret -fi -${VALGRIND} ./mac-override -ret=$? -if test $ret != 0; then - echo "overriden mac tests 2 failed" - exit $ret +if test "$WINDOWS" = 1;then + exit 77 +else + GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ./mac-override + ret=$? + if test $ret != 0; then + echo "overriden mac tests failed" + exit $ret + fi + + ${VALGRIND} ./mac-override + ret=$? + if test $ret != 0; then + echo "overriden mac tests 2 failed" + exit $ret + fi fi exit 0