[master] b5d314a60 logexpect: Stop waiting after seeing an End tag

[Dridi Boukelmoune]

commit b5d314a60fd102f453d215a7fec44c28c6747e9b
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Dec 2 20:50:34 2021 +0100

    logexpect: Stop waiting after seeing an End tag
    
    When a transaction ends, there will be nothing left to match for the
    transaction's VXID. Instead of timing the whole test case out, fail
    immediately.

diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 5a018cf89..ad7b85180 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -370,7 +370,7 @@ logexp_match(const struct logexp *le, struct logexp_test *test,
     const char *data, int vxid, int tag, int type, int len)
 {
 	const char *legend;
-	int ok = 1, skip = 0, alt, fail;
+	int ok = 1, skip = 0, alt, fail, vxid_ok = 0;
 
 	AN(le);
 	AN(test);
@@ -380,9 +380,11 @@ logexp_match(const struct logexp *le, struct logexp_test *test,
 	if (test->vxid == LE_LAST) {
 		if (le->vxid_last != vxid)
 			ok = 0;
+		vxid_ok = ok;
 	} else if (test->vxid >= 0) {
 		if (test->vxid != vxid)
 			ok = 0;
+		vxid_ok = ok;
 	}
 	if (test->tag == LE_LAST) {
 		if (le->tag_last != tag)
@@ -404,9 +406,14 @@ logexp_match(const struct logexp *le, struct logexp_test *test,
 		    test->skip_max > le->skip_cnt))
 		skip = 1;
 
+	if (skip && vxid_ok && tag == SLT_End)
+		fail = 1;
+
 	if (fail) {
 		if (ok)
 			legend = "fail";
+		else if (skip)
+			legend = "end";
 		else if (le->m_arg)
 			legend = "fmiss";
 		else
@@ -438,7 +445,7 @@ logexp_match(const struct logexp *le, struct logexp_test *test,
 		vtc_log(le->vl, 3, "alt      | %s", VSB_data(test->str));
 		return (logexp_match(le, test, data, vxid, tag, type, len));
 	}
-	if (skip)
+	if (skip && !fail)
 		return (LEM_SKIP);
 	return (LEM_FAIL);
 }