Commit e7bb8984 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

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"
parent 897f3f7d
...@@ -503,6 +503,8 @@ exec_file(const char *fn, const char *script, const char *tmpdir, ...@@ -503,6 +503,8 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
vltop = vtc_logopen("top"); vltop = vtc_logopen("top");
AN(vltop); AN(vltop);
vtc_log(vltop, 1, "TEST %s starting", fn);
init_macro(); init_macro();
init_server(); init_server();
init_syslog(); init_syslog();
...@@ -537,7 +539,6 @@ exec_file(const char *fn, const char *script, const char *tmpdir, ...@@ -537,7 +539,6 @@ exec_file(const char *fn, const char *script, const char *tmpdir,
AZ(fclose(f)); AZ(fclose(f));
vtc_stop = 0; vtc_stop = 0;
vtc_log(vltop, 1, "TEST %s starting", fn);
vtc_thread = pthread_self(); vtc_thread = pthread_self();
parse_string(script, cmds, NULL, vltop); parse_string(script, cmds, NULL, vltop);
......
...@@ -74,7 +74,7 @@ cmd_vtest(CMD_ARGS) ...@@ -74,7 +74,7 @@ cmd_vtest(CMD_ARGS)
return; return;
AZ(strcmp(av[0], "vtest")); AZ(strcmp(av[0], "vtest"));
vtc_log(vl, 1, "TEST %s", av[1]); vtc_log(vl, 1, "VTEST %s", av[1]);
AZ(av[2]); AZ(av[2]);
} }
...@@ -96,7 +96,7 @@ cmd_varnishtest(CMD_ARGS) ...@@ -96,7 +96,7 @@ cmd_varnishtest(CMD_ARGS)
return; return;
AZ(strcmp(av[0], "varnishtest")); AZ(strcmp(av[0], "varnishtest"));
vtc_log(vl, 1, "TEST %s", av[1]); vtc_log(vl, 1, "VTEST %s", av[1]);
AZ(av[2]); AZ(av[2]);
} }
......
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