diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
commit | 780e2d37e4d27f040d15e09b25542d6808a19436 (patch) | |
tree | ed63ad693d64961c3db56a423827e83e9760b156 /tests | |
parent | 503dec99f2e21fba336c989b209fadbf201e6f7e (diff) | |
parent | 715b9fe052f5a7c622a1f71f905461e06e398de8 (diff) | |
download | rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.gz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.xz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
plugins/imrelp/imrelp.c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 6 | ||||
-rw-r--r-- | tests/diagtalker.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a72f60b9..04afd761 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -155,6 +155,12 @@ test_files = testbench.h runtime-dummy.c EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ + testsuites/x.509/ca.pem \ + testsuites/x.509/ca-key.pem \ + testsuites/x.509/client-cert.pem \ + testsuites/x.509/client-key.pem \ + testsuites/x.509/machine-cert.pem \ + testsuites/x.509/machine-key.pem \ testsuites/invalid.conf \ testsuites/valid.conf \ cfg.sh \ diff --git a/tests/diagtalker.c b/tests/diagtalker.c index 0d728bda..f61270a8 100644 --- a/tests/diagtalker.c +++ b/tests/diagtalker.c @@ -70,6 +70,9 @@ int openConn(int *fd) } } } + if(retries > 0) { + fprintf(stderr, "connection established.\n"); + } *fd = sock; return 0; |