[master] 1feb6bbd3 varnishtest: reduce delta to vtest wrt the name
Nils Goroll
nils.goroll at uplex.de
Sat May 17 18:25:09 UTC 2025
commit 1feb6bbd30b6fc9394bf378d657fc785784268cd
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Sat May 17 20:01:30 2025 +0200
varnishtest: reduce delta to vtest wrt the name
In preparation of a new attempt to merge varnishtest and vtest, change all
a*.vtc self-tests to invoke varnishtest as vtest and use the vtest magic at the
beginning of the vtc file.
For invocation as vtest, we create links. For the installed binary, this is done
via a hook, but to support varnishtest -i usage, we also need to create the link
in the builddir.
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 653d0e2bc..411be155d 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -13,6 +13,19 @@ AM_CPPFLAGS = \
bin_PROGRAMS = varnishtest
+# for -i invocation / a00000.vtc
+all-local: vtest
+
+vtest: varnishtest
+ ln -f .libs/varnishtest vtest
+
+install-exec-hook:
+ ln -f $(DESTDIR)$(bindir)/varnishtest$(EXEEXT) \
+ $(DESTDIR)$(bindir)/vtest$(EXEEXT)
+
+uninstall-hook:
+ rm -f $(DESTDIR)$(bindir)/vtest$(EXEEXT)
+
varnishtest_SOURCES = \
hpack.h \
cmds.h \
@@ -88,4 +101,5 @@ BUILT_SOURCES = vtc_h2_dectbl.h
CLEANFILES = \
$(builddir)/teken_state.h \
- $(BUILT_SOURCES)
+ $(BUILT_SOURCES) \
+ vtest
diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc
index c11fda8f0..1d6292fad 100644
--- a/bin/varnishtest/tests/a00000.vtc
+++ b/bin/varnishtest/tests/a00000.vtc
@@ -1,44 +1,44 @@
-varnishtest "Test varnishtest itself"
+vtest "Test vtest itself"
-shell -exit 1 -expect {varnishtest [options]} {varnishtest -h}
+shell -exit 1 -expect {vtest [options]} {vtest -h}
-shell -exit 1 -match {-D.*Define macro} {varnishtest -h}
+shell -exit 1 -match {-D.*Define macro} {vtest -h}
shell {
pwd
- echo 'notvarnishtest foo bar' > _.vtc
+ echo 'notvtest foo bar' > _.vtc
echo 'shell "exit 9"' >> _.vtc
}
shell -exit 2 -expect {doesn't start with 'vtest' or 'varnishtest} {
- varnishtest -v _.vtc
+ vtest -v _.vtc
}
shell -exit 77 -expect {0 tests failed, 1 tests skipped, 0 tests passed} {
unset TMPDIR
- varnishtest -k _.vtc
+ vtest -k _.vtc
}
# Test external macro-def with a two-turtle test
shell -expect {__=barf} {
- echo varnishtest foo > _.vtc
+ echo vtest foo > _.vtc
printf 'shell {echo %c{foobar} > ${tmpdir}/__}' '$' >> _.vtc
- varnishtest -q -Dfoobar=barf _.vtc
+ vtest -q -Dfoobar=barf _.vtc
echo __=`cat __`
}
# Test a test failure
shell -exit 2 -expect {TEST _.vtc FAILED} {
- echo varnishtest foo > _.vtc
+ echo vtest foo > _.vtc
echo 'shell {false}' >> _.vtc
- exec varnishtest -v _.vtc || true
+ exec vtest -v _.vtc || true
}
# Test a test skip
shell -exit 77 -expect {TEST _.vtc skipped} {
- echo varnishtest foo > _.vtc
+ echo vtest foo > _.vtc
echo 'feature cmd false' >> _.vtc
- exec varnishtest -v _.vtc || true
+ exec vtest -v _.vtc || true
}
# Simple process tests
diff --git a/bin/varnishtest/tests/a00002.vtc b/bin/varnishtest/tests/a00002.vtc
index 0fb81d94e..83c00a008 100644
--- a/bin/varnishtest/tests/a00002.vtc
+++ b/bin/varnishtest/tests/a00002.vtc
@@ -1,4 +1,4 @@
-varnishtest "basic default HTTP transactions with expect and options"
+vtest "basic default HTTP transactions with expect and options"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00003.vtc b/bin/varnishtest/tests/a00003.vtc
index 7962eef7c..794ce7640 100644
--- a/bin/varnishtest/tests/a00003.vtc
+++ b/bin/varnishtest/tests/a00003.vtc
@@ -1,4 +1,4 @@
-varnishtest "dual independent HTTP transactions"
+vtest "dual independent HTTP transactions"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00004.vtc b/bin/varnishtest/tests/a00004.vtc
index 05474f620..d37288bc1 100644
--- a/bin/varnishtest/tests/a00004.vtc
+++ b/bin/varnishtest/tests/a00004.vtc
@@ -1,4 +1,4 @@
-varnishtest "dual shared server HTTP transactions"
+vtest "dual shared server HTTP transactions"
server s1 -repeat 2 {
rxreq
diff --git a/bin/varnishtest/tests/a00005.vtc b/bin/varnishtest/tests/a00005.vtc
index fe4885fa1..ede67c529 100644
--- a/bin/varnishtest/tests/a00005.vtc
+++ b/bin/varnishtest/tests/a00005.vtc
@@ -1,4 +1,4 @@
-varnishtest "dual shared client HTTP transactions"
+vtest "dual shared client HTTP transactions"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00006.vtc b/bin/varnishtest/tests/a00006.vtc
index 2ca486b83..7f1448747 100644
--- a/bin/varnishtest/tests/a00006.vtc
+++ b/bin/varnishtest/tests/a00006.vtc
@@ -1,4 +1,4 @@
-varnishtest "bidirectional message bodies"
+vtest "bidirectional message bodies"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00007.vtc b/bin/varnishtest/tests/a00007.vtc
index 5c7312d9b..fb971dba0 100644
--- a/bin/varnishtest/tests/a00007.vtc
+++ b/bin/varnishtest/tests/a00007.vtc
@@ -1,4 +1,4 @@
-varnishtest "TCP reuse"
+vtest "TCP reuse"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00008.vtc b/bin/varnishtest/tests/a00008.vtc
index dfa84d35b..9cf37d9f4 100644
--- a/bin/varnishtest/tests/a00008.vtc
+++ b/bin/varnishtest/tests/a00008.vtc
@@ -1,4 +1,4 @@
-varnishtest "Barrier operations"
+vtest "Barrier operations"
# bs -> server, bc -> client, bb -> both
barrier bs cond 4
diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index 79c5aec7b..902869c41 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -1,4 +1,4 @@
-varnishtest "VTC process: match text"
+vtest "VTC process: match text"
process p1 {
echo 0123
diff --git a/bin/varnishtest/tests/a00010.vtc b/bin/varnishtest/tests/a00010.vtc
index ce6b8190d..d29628ec7 100644
--- a/bin/varnishtest/tests/a00010.vtc
+++ b/bin/varnishtest/tests/a00010.vtc
@@ -1,4 +1,4 @@
-varnishtest "simply test that the framework support \0"
+vtest "simply test that the framework support \0"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00011.vtc b/bin/varnishtest/tests/a00011.vtc
index 7b71d0de6..fab31a883 100644
--- a/bin/varnishtest/tests/a00011.vtc
+++ b/bin/varnishtest/tests/a00011.vtc
@@ -1,4 +1,4 @@
-varnishtest "test vtc gzip support"
+vtest "test vtc gzip support"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00012.vtc b/bin/varnishtest/tests/a00012.vtc
index 9b044fca5..66b7f1f0b 100644
--- a/bin/varnishtest/tests/a00012.vtc
+++ b/bin/varnishtest/tests/a00012.vtc
@@ -1,4 +1,4 @@
-varnishtest "Ensure that we can test non-existence of headers (#1062)"
+vtest "Ensure that we can test non-existence of headers (#1062)"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00013.vtc b/bin/varnishtest/tests/a00013.vtc
index 91bfce0bd..d95ee8725 100644
--- a/bin/varnishtest/tests/a00013.vtc
+++ b/bin/varnishtest/tests/a00013.vtc
@@ -1,4 +1,4 @@
-varnishtest "Barrier operations"
+vtest "Barrier operations"
# same as a00008.vtc, with socket barriers instead
diff --git a/bin/varnishtest/tests/a00014.vtc b/bin/varnishtest/tests/a00014.vtc
index 860c1ca04..0207a0fae 100644
--- a/bin/varnishtest/tests/a00014.vtc
+++ b/bin/varnishtest/tests/a00014.vtc
@@ -1,6 +1,6 @@
-varnishtest "Custom feature verification"
+vtest "Custom feature verification"
feature cmd true
feature cmd false
-this is an invalid varnishtest command
+this is an invalid vtest command
diff --git a/bin/varnishtest/tests/a00015.vtc b/bin/varnishtest/tests/a00015.vtc
index f363d66d9..f3fcfdc5a 100644
--- a/bin/varnishtest/tests/a00015.vtc
+++ b/bin/varnishtest/tests/a00015.vtc
@@ -1,4 +1,4 @@
-varnishtest "Write a body to a file"
+vtest "Write a body to a file"
server s1 {
# First, HTTP checks
diff --git a/bin/varnishtest/tests/a00016.vtc b/bin/varnishtest/tests/a00016.vtc
index 888b59ccd..2e4f90417 100644
--- a/bin/varnishtest/tests/a00016.vtc
+++ b/bin/varnishtest/tests/a00016.vtc
@@ -1,4 +1,4 @@
-varnishtest "Shutdown"
+vtest "Shutdown"
barrier b1 cond 2
diff --git a/bin/varnishtest/tests/a00018.vtc b/bin/varnishtest/tests/a00018.vtc
index 5500d7c6e..45d1675e9 100644
--- a/bin/varnishtest/tests/a00018.vtc
+++ b/bin/varnishtest/tests/a00018.vtc
@@ -1,4 +1,4 @@
-varnishtest "feature ignore_unknown_macro"
+vtest "feature ignore_unknown_macro"
feature ignore_unknown_macro
diff --git a/bin/varnishtest/tests/a00019.vtc b/bin/varnishtest/tests/a00019.vtc
index 975364445..727c33ca9 100644
--- a/bin/varnishtest/tests/a00019.vtc
+++ b/bin/varnishtest/tests/a00019.vtc
@@ -1,4 +1,4 @@
-varnishtest "Check rxrespbody -max"
+vtest "Check rxrespbody -max"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00020.vtc b/bin/varnishtest/tests/a00020.vtc
index 6b50c11df..73d21dadd 100644
--- a/bin/varnishtest/tests/a00020.vtc
+++ b/bin/varnishtest/tests/a00020.vtc
@@ -1,14 +1,14 @@
-varnishtest "Test -bodyfrom"
+vtest "Test -bodyfrom"
server s1 {
rxreq
- expect req.bodylen == 241
+ expect req.bodylen == 235
txresp -bodyfrom ${testdir}/a00020.vtc
} -start
client c1 -connect ${s1_sock} {
txreq -bodyfrom ${testdir}/a00020.vtc
rxresp
- expect resp.bodylen == 241
+ expect resp.bodylen == 235
} -run
diff --git a/bin/varnishtest/tests/a00021.vtc b/bin/varnishtest/tests/a00021.vtc
index 9eb158582..e57f89d35 100644
--- a/bin/varnishtest/tests/a00021.vtc
+++ b/bin/varnishtest/tests/a00021.vtc
@@ -1,4 +1,4 @@
-varnishtest "tunnel basic coverage"
+vtest "tunnel basic coverage"
barrier b1 cond 2
barrier b2 cond 2
diff --git a/bin/varnishtest/tests/a00022.vtc b/bin/varnishtest/tests/a00022.vtc
index 86a26e86f..adf522935 100644
--- a/bin/varnishtest/tests/a00022.vtc
+++ b/bin/varnishtest/tests/a00022.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test setenv"
+vtest "Test setenv"
setenv FOO "BAR BAZ"
shell -expect "BAR BAZ" {echo $FOO}
diff --git a/bin/varnishtest/tests/a00023.vtc b/bin/varnishtest/tests/a00023.vtc
index b35a9ec7e..a8b8c245f 100644
--- a/bin/varnishtest/tests/a00023.vtc
+++ b/bin/varnishtest/tests/a00023.vtc
@@ -1,10 +1,10 @@
-varnishtest "Run server -dispatch more than once"
+vtest "Run server -dispatch more than once"
feature ignore_unknown_macro
shell {
cat <<-'EOF' >_.vtc
- varnishtest "Run server -dispatch more than once (nested)"
+ vtest "Run server -dispatch more than once (nested)"
server s0 {
rxreq
@@ -22,7 +22,7 @@ shell {
client c1 -run
EOF
- varnishtest -v _.vtc >_.log
+ vtest -v _.vtc >_.log
}
shell -match "s1 +rxhdr" { cat _.log }
diff --git a/bin/varnishtest/tests/a00024.vtc b/bin/varnishtest/tests/a00024.vtc
index 34e16c155..efab48af0 100644
--- a/bin/varnishtest/tests/a00024.vtc
+++ b/bin/varnishtest/tests/a00024.vtc
@@ -1,4 +1,4 @@
-varnishtest "test -nouseragent and -noserver"
+vtest "test -nouseragent and -noserver"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00025.vtc b/bin/varnishtest/tests/a00025.vtc
index 21c513f5c..f2e105ed0 100644
--- a/bin/varnishtest/tests/a00025.vtc
+++ b/bin/varnishtest/tests/a00025.vtc
@@ -1,4 +1,4 @@
-varnishtest "Basic VSM status check"
+vtest "Basic VSM status check"
# just launch varnishd
varnish v1 -cliok ping
diff --git a/bin/varnishtest/tests/a02000.vtc b/bin/varnishtest/tests/a02000.vtc
index c272dac01..faed96df3 100644
--- a/bin/varnishtest/tests/a02000.vtc
+++ b/bin/varnishtest/tests/a02000.vtc
@@ -1,4 +1,4 @@
-varnishtest "Close/accept after H/2 upgrade"
+vtest "Close/accept after H/2 upgrade"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02001.vtc b/bin/varnishtest/tests/a02001.vtc
index eb0253983..1cab65db5 100644
--- a/bin/varnishtest/tests/a02001.vtc
+++ b/bin/varnishtest/tests/a02001.vtc
@@ -1,4 +1,4 @@
-varnishtest "Quickly test all frames"
+vtest "Quickly test all frames"
server s1 {
rxpri
diff --git a/bin/varnishtest/tests/a02002.vtc b/bin/varnishtest/tests/a02002.vtc
index 2f6c504bd..14125d55b 100644
--- a/bin/varnishtest/tests/a02002.vtc
+++ b/bin/varnishtest/tests/a02002.vtc
@@ -1,4 +1,4 @@
-varnishtest "Trigger a compression error via bad index"
+vtest "Trigger a compression error via bad index"
server s1 {
non_fatal
diff --git a/bin/varnishtest/tests/a02003.vtc b/bin/varnishtest/tests/a02003.vtc
index eced2da04..abda36db9 100644
--- a/bin/varnishtest/tests/a02003.vtc
+++ b/bin/varnishtest/tests/a02003.vtc
@@ -1,4 +1,4 @@
-varnishtest "Check bodylen"
+vtest "Check bodylen"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02004.vtc b/bin/varnishtest/tests/a02004.vtc
index 915446080..90e22d55f 100644
--- a/bin/varnishtest/tests/a02004.vtc
+++ b/bin/varnishtest/tests/a02004.vtc
@@ -1,4 +1,4 @@
-varnishtest "Simple request with body"
+vtest "Simple request with body"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02005.vtc b/bin/varnishtest/tests/a02005.vtc
index 986a07270..e596f8381 100644
--- a/bin/varnishtest/tests/a02005.vtc
+++ b/bin/varnishtest/tests/a02005.vtc
@@ -1,4 +1,4 @@
-varnishtest "Continuation frames"
+vtest "Continuation frames"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02006.vtc b/bin/varnishtest/tests/a02006.vtc
index ecb49745f..9e18ef9d0 100644
--- a/bin/varnishtest/tests/a02006.vtc
+++ b/bin/varnishtest/tests/a02006.vtc
@@ -1,4 +1,4 @@
-varnishtest "Keep track of window credits"
+vtest "Keep track of window credits"
server s1 {
stream 2 {
diff --git a/bin/varnishtest/tests/a02007.vtc b/bin/varnishtest/tests/a02007.vtc
index 7d1be9282..5cd3e72aa 100644
--- a/bin/varnishtest/tests/a02007.vtc
+++ b/bin/varnishtest/tests/a02007.vtc
@@ -1,4 +1,4 @@
-varnishtest "HPACK test"
+vtest "HPACK test"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02008.vtc b/bin/varnishtest/tests/a02008.vtc
index 0c0c4029c..0e7143144 100644
--- a/bin/varnishtest/tests/a02008.vtc
+++ b/bin/varnishtest/tests/a02008.vtc
@@ -1,4 +1,4 @@
-varnishtest "HPACK test"
+vtest "HPACK test"
server s1 {
stream 0 {
diff --git a/bin/varnishtest/tests/a02009.vtc b/bin/varnishtest/tests/a02009.vtc
index 8668cb91a..37de4e6d7 100644
--- a/bin/varnishtest/tests/a02009.vtc
+++ b/bin/varnishtest/tests/a02009.vtc
@@ -1,4 +1,4 @@
-varnishtest "More HPACK tests"
+vtest "More HPACK tests"
server s1 {
stream 1 {
rxreq
diff --git a/bin/varnishtest/tests/a02010.vtc b/bin/varnishtest/tests/a02010.vtc
index 2e77c4d2d..151f64e24 100644
--- a/bin/varnishtest/tests/a02010.vtc
+++ b/bin/varnishtest/tests/a02010.vtc
@@ -1,4 +1,4 @@
-varnishtest "Verify the initial window size"
+vtest "Verify the initial window size"
server s1 {
stream 0 {
diff --git a/bin/varnishtest/tests/a02011.vtc b/bin/varnishtest/tests/a02011.vtc
index d4a7719e6..d0123c66d 100644
--- a/bin/varnishtest/tests/a02011.vtc
+++ b/bin/varnishtest/tests/a02011.vtc
@@ -1,4 +1,4 @@
-varnishtest "overflow"
+vtest "overflow"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02012.vtc b/bin/varnishtest/tests/a02012.vtc
index 83960b8e8..b560cd4b3 100644
--- a/bin/varnishtest/tests/a02012.vtc
+++ b/bin/varnishtest/tests/a02012.vtc
@@ -1,4 +1,4 @@
-varnishtest "padded DATA frames"
+vtest "padded DATA frames"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02013.vtc b/bin/varnishtest/tests/a02013.vtc
index 51d3a8038..48edfb69f 100644
--- a/bin/varnishtest/tests/a02013.vtc
+++ b/bin/varnishtest/tests/a02013.vtc
@@ -1,4 +1,4 @@
-varnishtest "H/2 state after sending/receiving preface"
+vtest "H/2 state after sending/receiving preface"
server s1 {
expect h2.state == false
diff --git a/bin/varnishtest/tests/a02014.vtc b/bin/varnishtest/tests/a02014.vtc
index b026e56b9..c58e158db 100644
--- a/bin/varnishtest/tests/a02014.vtc
+++ b/bin/varnishtest/tests/a02014.vtc
@@ -1,4 +1,4 @@
-varnishtest "priority"
+vtest "priority"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02015.vtc b/bin/varnishtest/tests/a02015.vtc
index e1f7b59d0..a38100fb7 100644
--- a/bin/varnishtest/tests/a02015.vtc
+++ b/bin/varnishtest/tests/a02015.vtc
@@ -1,4 +1,4 @@
-varnishtest "exclusive dependency"
+vtest "exclusive dependency"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02016.vtc b/bin/varnishtest/tests/a02016.vtc
index ea06e33cc..e75dddc5d 100644
--- a/bin/varnishtest/tests/a02016.vtc
+++ b/bin/varnishtest/tests/a02016.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test pseudo-headers inspection"
+vtest "Test pseudo-headers inspection"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02017.vtc b/bin/varnishtest/tests/a02017.vtc
index c0374f70e..c917fcf9c 100644
--- a/bin/varnishtest/tests/a02017.vtc
+++ b/bin/varnishtest/tests/a02017.vtc
@@ -1,4 +1,4 @@
-varnishtest "Push promise"
+vtest "Push promise"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02018.vtc b/bin/varnishtest/tests/a02018.vtc
index 7c281dfb0..c3da45ddf 100644
--- a/bin/varnishtest/tests/a02018.vtc
+++ b/bin/varnishtest/tests/a02018.vtc
@@ -1,4 +1,4 @@
-varnishtest "H/2 state after sending/receiving preface"
+vtest "H/2 state after sending/receiving preface"
server s1 {
expect h2.state == "false"
diff --git a/bin/varnishtest/tests/a02019.vtc b/bin/varnishtest/tests/a02019.vtc
index 388b6e506..299c61baa 100644
--- a/bin/varnishtest/tests/a02019.vtc
+++ b/bin/varnishtest/tests/a02019.vtc
@@ -1,4 +1,4 @@
-varnishtest "Static table encoding"
+vtest "Static table encoding"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02020.vtc b/bin/varnishtest/tests/a02020.vtc
index 38aba8755..962dcd0e9 100644
--- a/bin/varnishtest/tests/a02020.vtc
+++ b/bin/varnishtest/tests/a02020.vtc
@@ -1,4 +1,4 @@
-varnishtest "Reduce dynamic table while incoming headers are flying"
+vtest "Reduce dynamic table while incoming headers are flying"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02021.vtc b/bin/varnishtest/tests/a02021.vtc
index a04265f5d..8116e1542 100644
--- a/bin/varnishtest/tests/a02021.vtc
+++ b/bin/varnishtest/tests/a02021.vtc
@@ -1,4 +1,4 @@
-varnishtest "Reduce dynamic table size"
+vtest "Reduce dynamic table size"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02022.vtc b/bin/varnishtest/tests/a02022.vtc
index 1be052e05..c0aef0e19 100644
--- a/bin/varnishtest/tests/a02022.vtc
+++ b/bin/varnishtest/tests/a02022.vtc
@@ -1,4 +1,4 @@
-varnishtest "H/1 -> H/2 upgrade"
+vtest "H/1 -> H/2 upgrade"
feature cmd "nghttp --version | grep -q 'nghttp2/[1-9]'"
diff --git a/bin/varnishtest/tests/a02023.vtc b/bin/varnishtest/tests/a02023.vtc
index 3cbc94d58..e545b0631 100644
--- a/bin/varnishtest/tests/a02023.vtc
+++ b/bin/varnishtest/tests/a02023.vtc
@@ -1,4 +1,4 @@
-varnishtest "Window update"
+vtest "Window update"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02024.vtc b/bin/varnishtest/tests/a02024.vtc
index 746773592..3e702af10 100644
--- a/bin/varnishtest/tests/a02024.vtc
+++ b/bin/varnishtest/tests/a02024.vtc
@@ -1,4 +1,4 @@
-varnishtest "Write a body to a file"
+vtest "Write a body to a file"
server s1 {
fatal
diff --git a/bin/varnishtest/tests/a02025.vtc b/bin/varnishtest/tests/a02025.vtc
index 396e29e6e..594de1c28 100644
--- a/bin/varnishtest/tests/a02025.vtc
+++ b/bin/varnishtest/tests/a02025.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test -bodyfrom"
+vtest "Test -bodyfrom"
shell {printf helloworld >body.txt}
diff --git a/bin/varnishtest/tests/a02026.vtc b/bin/varnishtest/tests/a02026.vtc
index bf61aebc9..25c44b7b0 100644
--- a/bin/varnishtest/tests/a02026.vtc
+++ b/bin/varnishtest/tests/a02026.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test -gzipbody and -gziplen"
+vtest "Test -gzipbody and -gziplen"
server s1 {
stream 1 {
diff --git a/bin/varnishtest/tests/a02027.vtc b/bin/varnishtest/tests/a02027.vtc
index e9dcf6619..8156c199a 100644
--- a/bin/varnishtest/tests/a02027.vtc
+++ b/bin/varnishtest/tests/a02027.vtc
@@ -1,4 +1,4 @@
-varnishtest "Malformed :path handling"
+vtest "Malformed :path handling"
server s1 {
} -start
diff --git a/bin/varnishtest/tests/a02028.vtc b/bin/varnishtest/tests/a02028.vtc
index 4ba8986ed..08f696793 100644
--- a/bin/varnishtest/tests/a02028.vtc
+++ b/bin/varnishtest/tests/a02028.vtc
@@ -1,4 +1,4 @@
-varnishtest "Automatic stream numbers"
+vtest "Automatic stream numbers"
server s1 {
loop 4 {
More information about the varnish-commit
mailing list