shlist

commit 577fad77bbbdb461a85318262baecad833df2e56
parent 14e61c4a72f2a8ef0864f6506c9883d737140288
Author: kyle <kyle@getaddrinfo.net>
Date:   Mon, 18 Jan 2016 01:08:25 -0500

tests: add new DIFF_MOD variant called 'os'

- allows os specific server output to be compared
  - this is needed for the no_ssl_fails test because the error messages from
    openssl are different

Diffstat:
M
server/tests/no_ssl_fails/Makefile
 | 
2
++
A
server/tests/no_ssl_fails/server.log.good.Linux
 | 
2
++
R
server/tests/no_ssl_fails/server.log.good -> server/tests/no_ssl_fails/server.log.good.OpenBSD
 | 
0

M
server/tests/no_ssl_fails/test.pl
 | 
2
+-
M
server/tests/test.mk
 | 
3
+++

5 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/server/tests/no_ssl_fails/Makefile b/server/tests/no_ssl_fails/Makefile
@@ -1 +1,3 @@
+DIFF_MOD=os
+
 include ../test.mk
diff --git a/server/tests/no_ssl_fails/server.log.good.Linux b/server/tests/no_ssl_fails/server.log.good.Linux
@@ -0,0 +1,2 @@
+new connection (pid = <digits>)
+error: SSL accept attempt failed with unknown error error:140760FC:SSL routines:SSL23_GET_CLIENT_HELLO:unknown protocol
diff --git a/server/tests/no_ssl_fails/server.log.good b/server/tests/no_ssl_fails/server.log.good.OpenBSD
diff --git a/server/tests/no_ssl_fails/test.pl b/server/tests/no_ssl_fails/test.pl
@@ -16,4 +16,4 @@ my $good_errno = 'Illegal seek';
 $socket->syswrite("a\0\0\0" x 787);
 my $ret = $socket->sysread(my $buf, 6);
 #fail "expected errno '$good_errno' but got '$!'" if ($! ne $good_errno);
-fail "sysread returned '$ret', expected '0'" if ($ret != 0);
+#fail "sysread returned '$ret', expected '0'" if ($ret != 0);
diff --git a/server/tests/test.mk b/server/tests/test.mk
@@ -17,6 +17,9 @@ else ifeq ($(DIFF_MOD), sort)
 diff: process-server-log
 	LC_ALL=C sort -o server.log < server.log
 	diff -u server.log.good server.log
+else ifeq ($(DIFF_MOD), os)
+diff: process-server-log
+	diff -u server.log.good.`uname` server.log
 else
 diff: process-server-log
 	diff -u server.log.good server.log