[6.0] 3d8716d28 Sync with VTEST

[Dridi Boukelmoune]

commit 3d8716d28b7fa4d5f34759d960de03e42a9ea5a1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 15 13:32:16 2019 +0000

    Sync with VTEST

diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 357ef9269..b9c1def06 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -69,6 +69,8 @@ varnishtest_LDADD = \
 
 varnishtest_CFLAGS = \
 		@SAN_CFLAGS@ \
+		-DVTEST_WITH_VTC_LOGEXPECT \
+		-DVTEST_WITH_VTC_VARNISH \
 		-DTOP_BUILDDIR='"${top_builddir}"'
 
 EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \
diff --git a/bin/varnishtest/cmds.h b/bin/varnishtest/cmds.h
index fd140efe2..8eb2fa4f1 100644
--- a/bin/varnishtest/cmds.h
+++ b/bin/varnishtest/cmds.h
@@ -44,12 +44,16 @@ CMD_TOP(client)
 CMD_TOP(err_shell)
 CMD_TOP(feature)
 CMD_TOP(haproxy)
+#ifdef VTEST_WITH_VTC_LOGEXPECT
 CMD_TOP(logexpect)
+#endif
 CMD_TOP(process)
 CMD_TOP(server)
 CMD_TOP(setenv)
 CMD_TOP(syslog)
+#ifdef VTEST_WITH_VTC_VARNISH
 CMD_TOP(varnish)
+#endif
 CMD_TOP(varnishtest)
 CMD_TOP(vtest)
 #undef CMD_TOP
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 521c9ae3b..11f046f95 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#ifdef VTEST_WITH_VTC_LOGEXPECT
+
 /* SECTION: logexpect logexpect
  *
  * Reads the VSL and looks for records matching a given specification. It will
@@ -628,3 +630,5 @@ cmd_logexpect(CMD_ARGS)
 		logexp_spec(le, *av);
 	}
 }
+
+#endif /* VTEST_WITH_VTC_LOGEXPECT */
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 0c7b3f5a3..099a1abae 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#ifdef VTEST_WITH_VTC_VARNISH
+
 #include "config.h"
 
 #include <sys/types.h>
@@ -1238,3 +1240,5 @@ cmd_varnish(CMD_ARGS)
 		vtc_fatal(v->vl, "Unknown varnish argument: %s", *av);
 	}
 }
+
+#endif /* VTEST_WITH_VTC_VARNISH */