Rsyslogd TLS client side is unreliable. Disable compatiblity test.

3 files changed, 12 insertions, 5 deletions

diff --git a/regress/usr.sbin/syslogd/Makefile b/regress/usr.sbin/syslogd/Makefile
index 9d3d7f4827a..bb99d2eafcf 100644
--- a/regress/usr.sbin/syslogd/Makefile
+++ b/regress/usr.sbin/syslogd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2019/09/10 22:35:07 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.28 2019/09/17 22:24:08 bluhm Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-IO-Socket-INET6	object interface for AF_INET and AF_INET6 domain sockets
@@ -40,6 +40,12 @@ CLEANFILES +=		*.log *.log.? *.conf ktrace.out stamp-* *.pid
 CLEANFILES +=		*.out *.sock *.ktrace *.fstat ttylog *.ph */*.ph
 CLEANFILES +=		*.pem *.req *.key *.crt *.srl empty toobig diskimage
 
+run-args-rsyslog-client-tls.pl:
+	@echo '\n======== $@ ========'
+	# rsyslogd TLS client side is totally unreliable.  Startup of
+	# GnuTLS may take a long time on slow machines.  Disable test.
+	@echo DISABLED
+
 .MAIN: all
 
 REGRESS_SETUP_ONCE +=	setup
diff --git a/regress/usr.sbin/syslogd/funcs.pl b/regress/usr.sbin/syslogd/funcs.pl
index ac517e585f3..bdabfc934a3 100644
--- a/regress/usr.sbin/syslogd/funcs.pl
+++ b/regress/usr.sbin/syslogd/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.36 2019/09/10 22:35:07 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.37 2019/09/17 22:24:08 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -64,7 +64,7 @@ sub write_log {
 
 	write_message($self, $testlog);
 	IO::Handle::flush(\*STDOUT);
-	${$self->{syslogd}}->loggrep($testlog, 4);
+	${$self->{syslogd}}->loggrep($testlog, 2);
 	write_shutdown($self);
 }
 
@@ -76,7 +76,7 @@ sub write_between2logs {
 	$func->($self, @_);
 	write_message($self, $testlog);
 	IO::Handle::flush(\*STDOUT);
-	${$self->{syslogd}}->loggrep($testlog, 4);
+	${$self->{syslogd}}->loggrep($testlog, 2);
 	write_shutdown($self);
 }
 
diff --git a/regress/usr.sbin/syslogd/syslogd.pl b/regress/usr.sbin/syslogd/syslogd.pl
index 82333b33f1e..ce66ee2bf54 100644
--- a/regress/usr.sbin/syslogd/syslogd.pl
+++ b/regress/usr.sbin/syslogd/syslogd.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: syslogd.pl,v 1.10 2018/05/22 15:01:16 bluhm Exp $
+#	$OpenBSD: syslogd.pl,v 1.11 2019/09/17 22:24:08 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -125,6 +125,7 @@ foreach (@m) {
 $c->run->up if !$args{client}{noclient} && !$c->{early};
 $rc->run->up if $args{rsyslogd}{connect};
 
+$rc->down if $args{rsyslogd}{connect};
 $c->down if !$args{client}{noclient} && !$c->{early};
 $s->down unless $args{server}{noserver};
 foreach (@m) {