[master] c73b1b40d Revert "vtest: Allow to inject varnishd arguments via VTEST_VARNISHD_ADD_ARGS"

[Dridi Boukelmoune]

commit c73b1b40de8380e46562ebbefed7fcecf5d73c89
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Apr 14 15:09:54 2023 +0200

    Revert "vtest: Allow to inject varnishd arguments via VTEST_VARNISHD_ADD_ARGS"
    
    This reverts commit 1a9beb31d7f164832e00185b4d2ba85671f93d29.
    
    See discussion from #3897.

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 5c7fa3ce1..f763fcce7 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -93,8 +93,6 @@ struct varnish {
 
 #define NONSENSE	"%XJEIFLH|)Xspa8P"
 
-#define VARNISHD_ADD_ARGS_ENV_VAR	"VTEST_VARNISHD_ADD_ARGS"
-
 static VTAILQ_HEAD(, varnish)	varnishes =
     VTAILQ_HEAD_INITIALIZER(varnishes);
 
@@ -391,7 +389,7 @@ varnish_launch(struct varnish *v)
 	char abuf[128], pbuf[128];
 	struct pollfd fd[3];
 	enum VCLI_status_e u;
-	const char *err, *env_args;
+	const char *err;
 	char *r = NULL;
 
 	/* Create listener socket */
@@ -431,9 +429,6 @@ varnish_launch(struct varnish *v)
 	VSB_printf(vsb, " -P %s/varnishd.pid", v->workdir);
 	if (vmod_path != NULL)
 		VSB_printf(vsb, " -p vmod_path=%s", vmod_path);
-	env_args = getenv(VARNISHD_ADD_ARGS_ENV_VAR);
-	if (env_args)
-		VSB_printf(vsb, " %s", env_args);
 	VSB_printf(vsb, " %s", VSB_data(v->args));
 	AZ(VSB_finish(vsb));
 	vtc_log(v->vl, 3, "CMD: %s", VSB_data(vsb));
@@ -1073,9 +1068,6 @@ vsl_catchup(struct varnish *v)
  * \-arg STRING
  *         Pass an argument to varnishd, for example "-h simple_list".
  *
- *         The environment variable VTEST_VARNISHD_ADD_ARGS can be used to
- *         inject additional arguments.
- *
  * \-vcl STRING
  *         Specify the VCL to load on this Varnish instance. You'll probably
  *         want to use multi-lines strings for this ({...}).