diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:00:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-31 13:00:18 +0200 |
| commit | 0509f1404170c5aff7c9a154fbe882f4d067b1e4 (patch) | |
| tree | 218236dc70354ad2c03bf1c1bf744f0b83809b60 /tests | |
| parent | e3c90bf008d447bc087c4215a630ed023ca6a1b6 (diff) | |
| download | rsyslog-0509f1404170c5aff7c9a154fbe882f4d067b1e4.tar.gz rsyslog-0509f1404170c5aff7c9a154fbe882f4d067b1e4.tar.xz rsyslog-0509f1404170c5aff7c9a154fbe882f4d067b1e4.zip | |
preparing for 6.1.12 releasev6.1.12
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3f6110db..38d10da6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -103,10 +103,11 @@ TESTS += \ endif if ENABLE_GNUTLS -TESTS += \ - sndrcv_tls_anon.sh \ - sndrcv_tls_anon_rebind.sh \ - imtcp-tls-basic.sh +# TODO: re-enable in newer version +#TESTS += \ + #sndrcv_tls_anon.sh \ + #sndrcv_tls_anon_rebind.sh \ + #imtcp-tls-basic.sh if HAVE_VALGRIND # This test does not work on v5 as we keep DH params #TESTS += manytcp-too-few-tls.sh @@ -266,10 +267,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/diskqueue-fsync.conf \ imtcp-tls-basic.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 \ @@ -360,12 +357,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 \ @@ -465,6 +456,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 |