[master] 230d8f2 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

[Poul-Henning Kamp]

commit 230d8f2dcbb00f2bfae62e4d0f44ec0e3e5297c7
Merge: 01fbdac 50a77ab
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 31 11:14:48 2011 +0000

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache
    
    Conflicts:
    	bin/varnishtest/vtc_varnish.c

diff --cc bin/varnishtest/vtc.c
index d8c98e9,fcf89ca..d3bd8b2
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@@ -476,7 -534,7 +534,6 @@@ exec_file(const char *fn, const char *s
  {
  	unsigned old_err;
  	char *cwd, *p;
--	char topbuild[BUFSIZ];
  	FILE *f;
  	struct extmacro *m;
  
diff --cc bin/varnishtest/vtc_varnish.c
index c706487,ad8605d..66ad107
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@@ -245,30 -245,30 +245,30 @@@ varnish_launch(struct varnish *v
  	nap = VSS_resolve("127.0.0.1", "0", &ap);
  	AN(nap);
  	v->cli_fd = VSS_listen(ap[0], 1);
 -	TCP_myname(v->cli_fd, abuf, sizeof abuf, pbuf, sizeof pbuf);
 +	VTCP_myname(v->cli_fd, abuf, sizeof abuf, pbuf, sizeof pbuf);
  
 -	AZ(vsb_finish(v->args));
 +	AZ(VSB_finish(v->args));
  	vtc_log(v->vl, 2, "Launch");
 -	vsb = vsb_new_auto();
 +	vsb = VSB_new_auto();
  	AN(vsb);
- 	VSB_printf(vsb, "cd ${topbuild}/bin/varnishd &&");
- 	VSB_printf(vsb, " ./varnishd -d -d -n %s", v->workdir);
 -	vsb_printf(vsb, "cd ${pwd} &&");
 -	vsb_printf(vsb, " ${varnishd} -d -d -n %s", v->workdir);
 -	vsb_printf(vsb, " -l 10m,1m,-");
 -	vsb_printf(vsb, " -p auto_restart=off");
 -	vsb_printf(vsb, " -p syslog_cli_traffic=off");
 -	vsb_printf(vsb, " -a '%s'", "127.0.0.1:0");
 -	vsb_printf(vsb, " -S %s/_S", v->workdir);
 -	vsb_printf(vsb, " -M '%s %s'", abuf, pbuf);
 -	vsb_printf(vsb, " -P %s/varnishd.pid", v->workdir);
 -	vsb_printf(vsb, " %s", vsb_data(v->storage));
 -	vsb_printf(vsb, " %s", vsb_data(v->args));
 -	AZ(vsb_finish(vsb));
 -	vtc_log(v->vl, 3, "CMD: %s", vsb_data(vsb));
 -	vsb1 = macro_expand(v->vl, vsb_data(vsb));
++	VSB_printf(vsb, "cd ${pwd} &&");
++	VSB_printf(vsb, " ${varnishd} -d -d -n %s", v->workdir);
 +	VSB_printf(vsb, " -l 10m,1m,-");
 +	VSB_printf(vsb, " -p auto_restart=off");
 +	VSB_printf(vsb, " -p syslog_cli_traffic=off");
 +	VSB_printf(vsb, " -a '%s'", "127.0.0.1:0");
 +	VSB_printf(vsb, " -S %s/_S", v->workdir);
 +	VSB_printf(vsb, " -M '%s %s'", abuf, pbuf);
 +	VSB_printf(vsb, " -P %s/varnishd.pid", v->workdir);
 +	VSB_printf(vsb, " %s", VSB_data(v->storage));
 +	VSB_printf(vsb, " %s", VSB_data(v->args));
 +	AZ(VSB_finish(vsb));
 +	vtc_log(v->vl, 3, "CMD: %s", VSB_data(vsb));
 +	vsb1 = macro_expand(v->vl, VSB_data(vsb));
  	AN(vsb1);
 -	vsb_delete(vsb);
 +	VSB_delete(vsb);
  	vsb = vsb1;
 -	vtc_log(v->vl, 3, "CMD: %s", vsb_data(vsb));
 +	vtc_log(v->vl, 3, "CMD: %s", VSB_data(vsb));
  	AZ(pipe(&v->fds[0]));
  	AZ(pipe(&v->fds[2]));
  	v->pid = fork();