[6.0] 25cb590f3 Make varnishtest (more) agnostic about its own name.

[Dridi Boukelmoune]

commit 25cb590f3dc9fc224b20858de9015be8652beea0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 25 09:37:01 2018 +0000

    Make varnishtest (more) agnostic about its own name.

diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc
index 8fb9ded32..3f012b105 100644
--- a/bin/varnishtest/tests/a00000.vtc
+++ b/bin/varnishtest/tests/a00000.vtc
@@ -10,7 +10,7 @@ shell {
 	echo 'shell "exit 9"' >> _.vtc
 }
 
-shell -exit 2 -expect {doesn't start with 'vtest' or 'varnishtest'} {
+shell -exit 2 -expect {doesn't start with 'vtest' or 'varnishtes} {
 	varnishtest -v _.vtc
 }
 
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index cb0c2f07f..a06f6f08e 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -52,6 +52,8 @@
 #include "vtim.h"
 #include "vct.h"
 
+static const char *argv0;
+
 struct vtc_tst {
 	unsigned		magic;
 #define TST_MAGIC		0x618d8b88
@@ -124,7 +126,7 @@ parse_D_opt(char *arg)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: varnishtest [options] file ...\n");
+	fprintf(stderr, "usage: %s [options] file ...\n", argv0);
 #define FMT "    %-28s # %s\n"
 	fprintf(stderr, FMT, "-b size",
 	    "Set internal buffer size (default: 1M)");
@@ -577,6 +579,12 @@ main(int argc, char * const *argv)
 	uintmax_t bufsiz;
 	const char *p;
 
+	argv0 = strrchr(argv[0], '/');
+	if (argv0 == NULL)
+		argv0 = argv[0];
+	else
+		argv0++;
+
 	if (getenv("TMPDIR") != NULL)
 		tmppath = strdup(getenv("TMPDIR"));
 	else