[master] 82fe7af00 build: spell out vtest2/src

[Nils Goroll]

commit 82fe7af00f7984bbe65f0ef3620a19d20f7ee3b2
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue May 27 15:26:58 2025 +0200

    build: spell out vtest2/src
    
    using a variable does not work on the solaris vtesters

diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 3a2235889..a1d5b31fb 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -27,45 +27,43 @@ install-exec-hook:
 uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/vtest$(EXEEXT)
 
-vtest2_src = vtest2/src
-
 varnishtest_SOURCES = \
-		$(vtest2_src)/hpack.h \
-		$(vtest2_src)/cmds.h \
-		$(vtest2_src)/vtc.h \
-		$(vtest2_src)/teken.c \
-		$(vtest2_src)/teken.h \
-		$(vtest2_src)/teken_scs.h \
-		$(vtest2_src)/teken_subr.h \
-		$(vtest2_src)/teken_subr_compat.h \
-		$(vtest2_src)/teken_wcwidth.h \
-		$(vtest2_src)/vtc.c \
-		$(vtest2_src)/vtc_barrier.c \
-		$(vtest2_src)/vtc_client.c \
-		$(vtest2_src)/vtc_gzip.c \
-		$(vtest2_src)/vtc_haproxy.c \
-		$(vtest2_src)/vtc_h2_enctbl.h \
-		$(vtest2_src)/vtc_h2_hpack.c \
-		$(vtest2_src)/vtc_h2_priv.h \
-		$(vtest2_src)/vtc_h2_stattbl.h \
-		$(vtest2_src)/vtc_h2_tbl.c \
-		$(vtest2_src)/vtc_http.c \
-		$(vtest2_src)/vtc_http.h \
-		$(vtest2_src)/vtc_http2.c \
-		$(vtest2_src)/vtc_log.h \
-		$(vtest2_src)/vtc_log.c \
-		$(vtest2_src)/vtc_logexp.c \
-		$(vtest2_src)/vtc_misc.c \
-		$(vtest2_src)/vtc_main.c \
-		$(vtest2_src)/vtc_process.c \
-		$(vtest2_src)/vtc_proxy.c \
-		$(vtest2_src)/vtc_server.c \
-		$(vtest2_src)/vtc_sess.c \
-		$(vtest2_src)/vtc_subr.c \
-		$(vtest2_src)/vtc_syslog.c \
-		$(vtest2_src)/vtc_tunnel.c \
-		$(vtest2_src)/vtc_varnish.c \
-		$(vtest2_src)/vtc_vsm.c
+		vtest2/src/hpack.h \
+		vtest2/src/cmds.h \
+		vtest2/src/vtc.h \
+		vtest2/src/teken.c \
+		vtest2/src/teken.h \
+		vtest2/src/teken_scs.h \
+		vtest2/src/teken_subr.h \
+		vtest2/src/teken_subr_compat.h \
+		vtest2/src/teken_wcwidth.h \
+		vtest2/src/vtc.c \
+		vtest2/src/vtc_barrier.c \
+		vtest2/src/vtc_client.c \
+		vtest2/src/vtc_gzip.c \
+		vtest2/src/vtc_haproxy.c \
+		vtest2/src/vtc_h2_enctbl.h \
+		vtest2/src/vtc_h2_hpack.c \
+		vtest2/src/vtc_h2_priv.h \
+		vtest2/src/vtc_h2_stattbl.h \
+		vtest2/src/vtc_h2_tbl.c \
+		vtest2/src/vtc_http.c \
+		vtest2/src/vtc_http.h \
+		vtest2/src/vtc_http2.c \
+		vtest2/src/vtc_log.h \
+		vtest2/src/vtc_log.c \
+		vtest2/src/vtc_logexp.c \
+		vtest2/src/vtc_misc.c \
+		vtest2/src/vtc_main.c \
+		vtest2/src/vtc_process.c \
+		vtest2/src/vtc_proxy.c \
+		vtest2/src/vtc_server.c \
+		vtest2/src/vtc_sess.c \
+		vtest2/src/vtc_subr.c \
+		vtest2/src/vtc_syslog.c \
+		vtest2/src/vtc_tunnel.c \
+		vtest2/src/vtc_varnish.c \
+		vtest2/src/vtc_vsm.c
 
 varnishtest_LDADD = \
 		$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
@@ -79,27 +77,27 @@ varnishtest_CFLAGS = \
 		-DVTEST_WITH_VTC_VSM \
 		-DTOP_BUILDDIR='"${top_builddir}"'
 
-EXTRA_DIST = $(srcdir)/$(vtest2_src)/../tests/*.vtc \
+EXTRA_DIST = $(srcdir)/vtest2/src/../tests/*.vtc \
 	$(top_srcdir)/bin/varnishtest/tests/*.vtc \
 	$(top_srcdir)/bin/varnishtest/tests/common.pem \
 	$(top_srcdir)/bin/varnishtest/tests/README \
-	$(vtest2_src)/gensequences \
-	$(vtest2_src)/sequences \
-	$(vtest2_src)/teken.3 \
-	$(vtest2_src)/huffman_gen.py \
-	$(vtest2_src)/tbl/vhp_huffman.h
+	vtest2/src/gensequences \
+	vtest2/src/sequences \
+	vtest2/src/teken.3 \
+	vtest2/src/huffman_gen.py \
+	vtest2/src/tbl/vhp_huffman.h
 
 teken.c: teken_state.h
 
-teken_state.h:	$(srcdir)/$(vtest2_src)/sequences $(srcdir)/$(vtest2_src)/gensequences
-	awk -f $(srcdir)/$(vtest2_src)/gensequences $(srcdir)/$(vtest2_src)/sequences \
+teken_state.h:	$(srcdir)/vtest2/src/sequences $(srcdir)/vtest2/src/gensequences
+	awk -f $(srcdir)/vtest2/src/gensequences $(srcdir)/vtest2/src/sequences \
 	    > $@_
 	mv $@_ $@
 
 vtc_h2_hpack.c: vtc_h2_dectbl.h
-vtc_h2_dectbl.h: $(srcdir)/$(vtest2_src)/huffman_gen.py $(srcdir)/$(vtest2_src)/tbl/vhp_huffman.h
-	$(PYTHON) $(srcdir)/$(vtest2_src)/huffman_gen.py \
-	    $(srcdir)/$(vtest2_src)/tbl/vhp_huffman.h > $@_
+vtc_h2_dectbl.h: $(srcdir)/vtest2/src/huffman_gen.py $(srcdir)/vtest2/src/tbl/vhp_huffman.h
+	$(PYTHON) $(srcdir)/vtest2/src/huffman_gen.py \
+	    $(srcdir)/vtest2/src/tbl/vhp_huffman.h > $@_
 	mv $@_ $@
 
 BUILT_SOURCES = \