diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:12:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:12:19 +0200 |
| commit | e5d0f176fce7a96dbea164d13b4b549ecb424434 (patch) | |
| tree | 55d3332b63375fe37be478e7cf73a5fb4bf10597 /tests | |
| parent | dd55f8311f9eba74bd17692696f1225f8df512d2 (diff) | |
| parent | 0509f1404170c5aff7c9a154fbe882f4d067b1e4 (diff) | |
| download | rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.tar.gz rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.tar.xz rsyslog-e5d0f176fce7a96dbea164d13b4b549ecb424434.zip | |
Merge branch 'beta'v6.3.5
Conflicts:
configure.ac
doc/manual.html
tests/Makefile.am
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d0c056ad..9893afab 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -104,11 +104,11 @@ TESTS += \ endif if ENABLE_GNUTLS -TESTS += \ - sndrcv_tls_anon.sh \ - sndrcv_tls_anon_rebind.sh \ - imtcp-tls-basic.sh \ - imtcp_conndrop_tls.sh +# TODO: re-enable in newer version +#TESTS += \ + #sndrcv_tls_anon.sh \ + #sndrcv_tls_anon_rebind.sh \ + #imtcp-tls-basic.sh if HAVE_VALGRIND TESTS += imtcp-tls-basic-vg.sh \ imtcp_conndrop_tls-vg.sh @@ -270,10 +270,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ imtcp-tls-basic.sh \ imtcp-tls-basic-vg.sh \ testsuites/imtcp-tls-basic.conf \ - tls-certs/ca-key.pem \ - tls-certs/ca.pem \ - tls-certs/cert.pem \ - tls-certs/key.pem \ imtcp-multiport.sh \ testsuites/imtcp-multiport.conf \ udp-msgreduc-orgmsg-vg.sh \ @@ -369,12 +365,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ sndrcv_gzip.sh \ testsuites/sndrcv_gzip_sender.conf \ testsuites/sndrcv_gzip_rcvr.conf \ - sndrcv_tls_anon_rebind.sh \ - testsuites/sndrcv_tls_anon_rebind_sender.conf \ - testsuites/sndrcv_tls_anon_rebind_rcvr.conf \ - sndrcv_tls_anon.sh \ - testsuites/sndrcv_tls_anon_sender.conf \ - testsuites/sndrcv_tls_anon_rcvr.conf \ pipeaction.sh \ testsuites/pipeaction.conf \ pipe_noreader.sh \ @@ -474,6 +464,15 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/mysql-asyn.conf \ cfg.sh +# TODO: re-enable +#sndrcv_tls_anon_rebind.sh \ +#testsuites/sndrcv_tls_anon_rebind_sender.conf \ +#testsuites/sndrcv_tls_anon_rebind_rcvr.conf \ +#sndrcv_tls_anon.sh \ +#testsuites/sndrcv_tls_anon_sender.conf \ +#testsuites/sndrcv_tls_anon_rcvr.conf \ +# + ourtail_SOURCES = ourtail.c msleep_SOURCES = msleep.c chkseq_SOURCES = chkseq.c |