[master] 7615e5599 Polish varnishtest logexpect abort and document it

Nils Goroll nils.goroll at uplex.de
Mon Mar 14 14:00:07 UTC 2022


commit 7615e55999bbd81321c4ad0df7b4183dc12f35c8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Mar 14 14:59:47 2022 +0100

    Polish varnishtest logexpect abort and document it

diff --git a/bin/varnishtest/tests/l00001.vtc b/bin/varnishtest/tests/l00001.vtc
index bcd4391b7..a53187ee3 100644
--- a/bin/varnishtest/tests/l00001.vtc
+++ b/bin/varnishtest/tests/l00001.vtc
@@ -22,6 +22,7 @@ client c1 {
 # Test 'eq' operator
 logexpect l1 -d 1 -g vxid -q "Begin eq 'req 1000 rxreq'" {
 	expect 0 *	Begin	req
+	abort
 	expect * =	End
 } -run
 
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index b9a1300be..c542619b1 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -45,6 +45,7 @@
  *                         expect <skip> <vxid> <tag> <regex>
  *                         fail add <vxid> <tag> <regex>
  *                         fail clear
+ *                         abort
  *                         ...
  *                 } [-start|-wait]
  *
@@ -139,6 +140,11 @@
  *      fail clear
  *
  * .. XXX can we come up with a better solution which is still safe?
+ *
+ * abort specification:
+ *
+ * abort(3) varnishtest, intended to help debugging of the VSL client library
+ * itself.
  */
 
 #include "config.h"
@@ -760,9 +766,6 @@ cmd_logexp_abort(CMD_ARGS)
 
 	CAST_OBJ_NOTNULL(le, priv, LOGEXP_MAGIC);
 
-	if (av[1] == NULL || av[2] == NULL || av[3] == NULL)
-		vtc_fatal(vl, "Syntax error");
-
 	cmd_logexp_common(le, vl, LE_ABORT, av);
 }
 


More information about the varnish-commit mailing list