diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-11-10 10:34:56 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-11-12 14:43:02 +0100 |
| commit | 53ac61b831b2cfce9833f6c01fb65eb7362dc170 (patch) | |
| tree | 6af31ff7f9e74b8becd49633d5122a11bed232bf | |
| parent | f55d4400abdfa113334da80214beda88bea0c5a4 (diff) | |
| download | gnutls-53ac61b831b2cfce9833f6c01fb65eb7362dc170.tar.gz | |
tests: suite: don't run shell scripts with valgrind
| -rw-r--r-- | tests/suite/Makefile.am | 10 | ||||
| -rwxr-xr-x | tests/suite/chain.sh (renamed from tests/suite/chain) | 0 | ||||
| -rwxr-xr-x | tests/suite/test-ciphersuite-names.sh (renamed from tests/suite/test-ciphersuite-names) | 0 | ||||
| -rwxr-xr-x | tests/suite/testpkcs11.sh (renamed from tests/suite/testpkcs11) | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 6a012ca95c..c6d60f43d2 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -84,17 +84,17 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c \ -nodist_check_SCRIPTS = eagain testsrn chain invalid-cert testrandom \ - testpkcs11 testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm \ +nodist_check_SCRIPTS = eagain testsrn chain.sh invalid-cert testrandom \ + testpkcs11.sh testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm \ testrng testcompat-main-polarssl testcompat-main-openssl testcompat-common \ testcompat-polarssl testcompat-openssl -TESTS = test-ciphersuite-names eagain testsrn chain invalid-cert \ +TESTS = test-ciphersuite-names.sh eagain testsrn chain.sh invalid-cert \ testrng testcompat-openssl testcompat-polarssl if ENABLE_PKCS11 check_PROGRAMS += pkcs11-chainverify pkcs11-get-issuer pkcs11-is-known pkcs11-combo pkcs11-privkey -TESTS += testpkcs11 pkcs11-chainverify pkcs11-get-issuer crl-test pkcs11-is-known pkcs11-combo pkcs11-privkey +TESTS += testpkcs11.sh pkcs11-chainverify pkcs11-get-issuer crl-test pkcs11-is-known pkcs11-combo pkcs11-privkey endif TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ @@ -124,5 +124,7 @@ endif #pkcs11-chainverify cannot run under valgrind (or hell breaks loose) if WANT_TEST_SUITE +TEST_EXTENSIONS = .sh LOG_COMPILER = $(VALGRIND) +SH_LOG_COMPILER = endif diff --git a/tests/suite/chain b/tests/suite/chain.sh index 10868f97b9..10868f97b9 100755 --- a/tests/suite/chain +++ b/tests/suite/chain.sh diff --git a/tests/suite/test-ciphersuite-names b/tests/suite/test-ciphersuite-names.sh index a00fa482de..a00fa482de 100755 --- a/tests/suite/test-ciphersuite-names +++ b/tests/suite/test-ciphersuite-names.sh diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11.sh index caed6c0cea..e8bb9c2c8b 100755 --- a/tests/suite/testpkcs11 +++ b/tests/suite/testpkcs11.sh @@ -27,7 +27,7 @@ CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" RETCODE=0 if ! test -z "${VALGRIND}"; then - VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --leak-check=no" + VALGRIND="${LIBTOOL:-libtool} --mode=execute valgrind --leak-check=full" fi TMPFILE="testpkcs11.debug" |