[master] 631f23e Fix the meaning of '=' in logexpect

Martin Blix Grydeland martin at varnish-software.com
Mon Mar 31 11:28:00 CEST 2014


commit 631f23e6f043b5a6c67de2ce69dd231c2b77c4a7
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Sun Mar 30 03:36:25 2014 +0200

    Fix the meaning of '=' in logexpect
    
    Fix the meaning of '=' in logexpect to mean same value as that of the
    last successfully matched log record.

diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 5b18f0b..92fa5ae 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -42,7 +42,7 @@
  * tag:  [tagname|*|=]		Tag to match against
  * regex:			regular expression to match against (optional)
  * *:				Match anything
- * =:				Match value of last examined log record
+ * =:				Match value of last successfully matched record
  */
 
 #include "config.h"
@@ -245,6 +245,8 @@ logexp_dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			    legend, vxid, VSL_tags[tag], type, len, data);
 
 			if (ok) {
+				le->vxid_last = vxid;
+				le->tag_last = tag;
 				le->skip_cnt = 0;
 				logexp_next(le);
 				if (le->test == NULL)
@@ -253,9 +255,6 @@ logexp_dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			}
 			if (skip)
 				le->skip_cnt++;
-
-			le->vxid_last = vxid;
-			le->tag_last = tag;
 		}
 	}
 



More information about the varnish-commit mailing list