[master] e7bb89840 Make it easier to parse the output consistently:
Poul-Henning Kamp
phk at FreeBSD.org
Mon Oct 29 08:42:11 UTC 2018
commit e7bb898400a4ba8757ea7184868a6da7414aa3e8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Oct 29 08:40:40 2018 +0000
Make it easier to parse the output consistently:
Always make "* top %f TEST ${test} starting" the first message.
Tag vtest and varnishtest message with "VTEST" instead of "TEST"
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 2b98596a8..66a2f97f2 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -503,6 +503,8 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
vltop = vtc_logopen("top");
AN(vltop);
+ vtc_log(vltop, 1, "TEST %s starting", fn);
+
init_macro();
init_server();
init_syslog();
@@ -537,7 +539,6 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
AZ(fclose(f));
vtc_stop = 0;
- vtc_log(vltop, 1, "TEST %s starting", fn);
vtc_thread = pthread_self();
parse_string(script, cmds, NULL, vltop);
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index b55d4be13..9fac1360a 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -74,7 +74,7 @@ cmd_vtest(CMD_ARGS)
return;
AZ(strcmp(av[0], "vtest"));
- vtc_log(vl, 1, "TEST %s", av[1]);
+ vtc_log(vl, 1, "VTEST %s", av[1]);
AZ(av[2]);
}
@@ -96,7 +96,7 @@ cmd_varnishtest(CMD_ARGS)
return;
AZ(strcmp(av[0], "varnishtest"));
- vtc_log(vl, 1, "TEST %s", av[1]);
+ vtc_log(vl, 1, "VTEST %s", av[1]);
AZ(av[2]);
}
More information about the varnish-commit
mailing list