summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2016-02-02 14:47:58 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-15 10:16:54 +0100
commitd74d33e1e403782a4840a62ecda5ad148e933dcd (patch)
treeecf0542c4de43b035bb90644cf4a383bfafb1e63
parentf3e06eeb77818d4bcb4e489507c4683475a5ca0e (diff)
downloadmeta-openembedded-d74d33e1e403782a4840a62ecda5ad148e933dcd.tar.gz
rsyslog: add tls related tests
Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch28
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch
new file mode 100644
index 000000000..c858f32b9
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch
@@ -0,0 +1,28 @@
1Enable tls ptest
2
3Signed-off-by: Tudor Florea <tudor.florea@enea.com>
4Upstream-Status: Pending
5
6--- rsyslog-7.4.4/tests/Makefile.am.orig 2013-08-30 18:30:41.000000000 +0200
7+++ rsyslog-7.4.4/tests/Makefile.am 2015-10-01 09:38:45.176289031 +0200
8@@ -118,15 +118,13 @@
9 endif
10
11 if ENABLE_GNUTLS
12-# TODO: re-enable in newer version
13-#TESTS += \
14- #sndrcv_tls_anon.sh \
15- #sndrcv_tls_anon_rebind.sh \
16- #imtcp-tls-basic.sh
17+TESTS += \
18+ imtcp-tls-basic.sh \
19+ imtcp_conndrop_tls.sh
20 if HAVE_VALGRIND
21 TESTS += imtcp-tls-basic-vg.sh \
22- imtcp_conndrop_tls-vg.sh
23- manytcp-too-few-tls-vg.sh
24+ imtcp_conndrop_tls-vg.sh \
25+ manytcp-too-few-tls.sh
26 endif
27 endif
28
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
index 928434eb7..0f6b6cfe7 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
@@ -27,6 +27,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
27 file://json-0.12-fix.patch \ 27 file://json-0.12-fix.patch \
28 file://replace_deprecated_GnuTLS_functions.patch \ 28 file://replace_deprecated_GnuTLS_functions.patch \
29 file://use_gnutls_certificate_type_set_priority_only_if_available.patch \ 29 file://use_gnutls_certificate_type_set_priority_only_if_available.patch \
30 file://enable_tls_ptests.patch \
30" 31"
31 32
32SRC_URI[md5sum] = "093c462a5245012bd9e7b82dd8aedffb" 33SRC_URI[md5sum] = "093c462a5245012bd9e7b82dd8aedffb"