Commit 88eee905 authored by Geoff Simmons's avatar Geoff Simmons

Update regression test with binary log from Varnish 7.4.2.

parent 9f47f465
...@@ -42,7 +42,7 @@ function regress { ...@@ -42,7 +42,7 @@ function regress {
# the second sed removes the user under which the child process runs # the second sed removes the user under which the child process runs
# "Not running as root" filtered so that the test is independent of # "Not running as root" filtered so that the test is independent of
# the user running it # the user running it
CKSUM=$( grep -v 'Worker 1' $LOG | sed -e 's/\(initializing\) \(.*\)/\1/' | sed -e 's/\(Running as\) \([a-zA-Z0-9]*\)$/\1/' | grep -v 'Not running as root' | cksum) CKSUM=$( grep -v 'Worker 1' $LOG | sed -e 's/\(initializing\) \(.*\)/\1/' | sed -e 's/\(Running as\) \([a-zA-Z0-9]*\)$/\1/' -e 's/\(Reader: took\) [0-9]* \(free\)/\1 \2/' | grep -v 'Not running as root' | cksum)
if [ "$CKSUM" != "$2" ]; then if [ "$CKSUM" != "$2" ]; then
echo "ERROR: Regression test incorrect reader log cksum: $CKSUM" echo "ERROR: Regression test incorrect reader log cksum: $CKSUM"
exit 1 exit 1
...@@ -67,15 +67,11 @@ function regress { ...@@ -67,15 +67,11 @@ function regress {
} }
echo '... standard VCL_Log syntax' echo '... standard VCL_Log syntax'
regress 'varnish.binlog' '4193098095 333282' '1274763305 56045' \ regress 'varnish.binlog' '3797708781 290937096' '1401120156 33507479' \
'1485621276 46141' '3845964878 33359820'
echo '... legacy VCL_Log syntax'
regress 'varnish.legacy.binlog' '3334052518 375477' '3908916621 57319' \
'1139478852 48689'
if [ "$TESTDIR" != "." ]; then if [ "$TESTDIR" != "." ]; then
rm -f varnish.binlog varnish.legacy.binlog test.conf file_mq.conf rm -f varnish.binlog test.conf file_mq.conf
fi fi
exit 0 exit 0
# Test configuration for the varnish log tracking reader # Test configuration for the varnish log tracking reader
log.file = /tmp/trackrdrd.log log.file = /tmp/trackrdrd.log
pid.file = trackrdrd.pid pid.file = trackrdrd.pid
max.reclen = 4096 max.reclen = 8192
max.records = 1024 max.records = 4096
tx.limit = 1500
monitor.interval = 0 monitor.interval = 0
nworkers = 1 nworkers = 1
mq.module = ../mq/file/.libs/libtrackrdr-file.so mq.module = ../mq/file/.libs/libtrackrdr-file.so
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment