diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-12-30 12:01:16 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-12-30 12:01:16 +0200 |
commit | 412ea9fc5af9f54ca9375e9f73c051f510478d4c (patch) | |
tree | e87019d1fc9133bdcf74da90d95f91d6ae25b70e | |
parent | 92353d742863ce89d4b1861c6fed26228e391ed2 (diff) | |
download | gnutls-412ea9fc5af9f54ca9375e9f73c051f510478d4c.tar.gz |
do not use valgrind in windows
-rw-r--r-- | tests/Makefile.am | 7 | ||||
-rw-r--r-- | tests/openpgp-auth2.c | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 31fc875597..b00adfc2a7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,9 @@ TESTS_ENVIRONMENT = \ PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12 \ PKCS12PASSWORD_2="" \ EXEEXT=$(EXEEXT) \ - srcdir="$(srcdir)" \ - $(VALGRIND) + srcdir="$(srcdir)" +if !WINDOWS +TESTS_ENVIRONMENT += \ + $(VALGRIND) +endif diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c index 85820cc5d0..9f3cd38585 100644 --- a/tests/openpgp-auth2.c +++ b/tests/openpgp-auth2.c @@ -23,6 +23,8 @@ #include <config.h> #endif +#if !defined(_WIN32) + #include <gnutls/gnutls.h> #include <gnutls/openpgp.h> @@ -38,6 +40,7 @@ #include <errno.h> #include <stdio.h> + /* This is the same test as openpgp-auth but tests * openpgp under the latest TLS protocol (TLSv1.2). In * addition it tests DSS signatures under that. @@ -247,3 +250,10 @@ doit () fail ("child failed: %d\n", status); } } +#else +void +doit () +{ + exit (77); +} +#endif |