[master] 6f038c1 Remove $Id$ from the source code, git does not support it.
Poul-Henning Kamp
phk at varnish-cache.org
Wed Apr 20 12:35:39 CEST 2011
commit 6f038c18768b6dd524c392ebe2765b06f5650b27
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Apr 20 10:35:13 2011 +0000
Remove $Id$ from the source code, git does not support it.
diff --git a/Makefile.am b/Makefile.am
index 4797573..802c91e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.des b/autogen.des
index 0c272bc..1bed874 100755
--- a/autogen.des
+++ b/autogen.des
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $Id$
-#
+# Use this when doing code development
set -ex
diff --git a/autogen.sh b/autogen.sh
index 53d0f73..07df626 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
warn() {
echo "WARNING: $@" 1>&2
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c081ea8..7bdddbb 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
SUBDIRS = varnishadm varnishd varnishlog varnishncsa varnishreplay varnishtest
diff --git a/bin/flint.lnt b/bin/flint.lnt
index e510817..b10ceba 100644
--- a/bin/flint.lnt
+++ b/bin/flint.lnt
@@ -9,8 +9,6 @@
+libh ../../config.h
-efile(451, ../../config.h) // No include guard
--esym(528, svnid) // Sym not ref
-
-efile(451, vsl_tags.h) // No include guard
-efile(451, vsc_fields.h) // No include guard
diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index 2717acb..03fb471 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 8d98181..f280b31 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <fcntl.h>
#include <poll.h>
#include <stdio.h>
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 1ca60b9..f293d09 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = \
-I$(top_srcdir)/include \
diff --git a/bin/varnishd/acct_fields.h b/bin/varnishd/acct_fields.h
index 36dbe58..35565ab 100644
--- a/bin/varnishd/acct_fields.h
+++ b/bin/varnishd/acct_fields.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* These are the stats we keep track of per session. They will be summed,
* via the sp->wrk->stats into the s_<name> fields in the SHM file.
* NB: Remember to mark those in vsc_fields.h to be included in struct dstat.
diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index a1ea70c..7e9c0d9 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*
diff --git a/bin/varnishd/cache_acceptor.c b/bin/varnishd/cache_acceptor.c
index 4bdb9ff..264cfc0 100644
--- a/bin/varnishd/cache_acceptor.c
+++ b/bin/varnishd/cache_acceptor.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <poll.h>
diff --git a/bin/varnishd/cache_backend.c b/bin/varnishd/cache_backend.c
index 93f4a77..8f2ebb8 100644
--- a/bin/varnishd/cache_backend.c
+++ b/bin/varnishd/cache_backend.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_backend.h b/bin/varnishd/cache_backend.h
index a437256..37796d4 100644
--- a/bin/varnishd/cache_backend.h
+++ b/bin/varnishd/cache_backend.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* This is the central switch-board for backend connections and it is
* slightly complicated by a number of optimizations.
*
diff --git a/bin/varnishd/cache_backend_cfg.c b/bin/varnishd/cache_backend_cfg.c
index 15dcc80..2e54fd5 100644
--- a/bin/varnishd/cache_backend_cfg.c
+++ b/bin/varnishd/cache_backend_cfg.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishd/cache_backend_poll.c b/bin/varnishd/cache_backend_poll.c
index abd5ccc..543840a 100644
--- a/bin/varnishd/cache_backend_poll.c
+++ b/bin/varnishd/cache_backend_poll.c
@@ -37,9 +37,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_backend_poll.h b/bin/varnishd/cache_backend_poll.h
index 270f0ac..2612916 100644
--- a/bin/varnishd/cache_backend_poll.h
+++ b/bin/varnishd/cache_backend_poll.h
@@ -25,8 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
*/
BITMAP(good_ipv4, '4', "Good IPv4", 0)
diff --git a/bin/varnishd/cache_ban.c b/bin/varnishd/cache_ban.c
index 0d27bbc..2ba366c 100644
--- a/bin/varnishd/cache_ban.c
+++ b/bin/varnishd/cache_ban.c
@@ -42,9 +42,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache_ban.h b/bin/varnishd/cache_ban.h
index a93b368..700bc12 100644
--- a/bin/varnishd/cache_ban.h
+++ b/bin/varnishd/cache_ban.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
*/
struct ban_test;
diff --git a/bin/varnishd/cache_center.c b/bin/varnishd/cache_center.c
index 671cf9f..de7632a 100644
--- a/bin/varnishd/cache_center.c
+++ b/bin/varnishd/cache_center.c
@@ -57,9 +57,6 @@ DOT acceptor -> start [style=bold,color=green]
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <math.h>
diff --git a/bin/varnishd/cache_cli.c b/bin/varnishd/cache_cli.c
index 056a63c..0ea5ba7 100644
--- a/bin/varnishd/cache_cli.c
+++ b/bin/varnishd/cache_cli.c
@@ -37,9 +37,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_dir.c b/bin/varnishd/cache_dir.c
index 615ab87..f27f4f7 100644
--- a/bin/varnishd/cache_dir.c
+++ b/bin/varnishd/cache_dir.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include "cache.h"
#include "cache_backend.h"
diff --git a/bin/varnishd/cache_dir_dns.c b/bin/varnishd/cache_dir_dns.c
index 791cd31..b457d05 100644
--- a/bin/varnishd/cache_dir_dns.c
+++ b/bin/varnishd/cache_dir_dns.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/bin/varnishd/cache_dir_random.c b/bin/varnishd/cache_dir_random.c
index 9727232..eb415b9 100644
--- a/bin/varnishd/cache_dir_random.c
+++ b/bin/varnishd/cache_dir_random.c
@@ -41,9 +41,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/bin/varnishd/cache_dir_round_robin.c b/bin/varnishd/cache_dir_round_robin.c
index e8615ac..70cac97 100644
--- a/bin/varnishd/cache_dir_round_robin.c
+++ b/bin/varnishd/cache_dir_round_robin.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/bin/varnishd/cache_esi_deliver.c b/bin/varnishd/cache_esi_deliver.c
index 6e82db1..c06679e 100644
--- a/bin/varnishd/cache_esi_deliver.c
+++ b/bin/varnishd/cache_esi_deliver.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id")
-
#include <stdlib.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache_esi_fetch.c b/bin/varnishd/cache_esi_fetch.c
index 8c94460..9dbb501 100644
--- a/bin/varnishd/cache_esi_fetch.c
+++ b/bin/varnishd/cache_esi_fetch.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id")
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_esi_parse.c b/bin/varnishd/cache_esi_parse.c
index d8d4f88..856d63d 100644
--- a/bin/varnishd/cache_esi_parse.c
+++ b/bin/varnishd/cache_esi_parse.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id")
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_expire.c b/bin/varnishd/cache_expire.c
index ec6ff66..f758053 100644
--- a/bin/varnishd/cache_expire.c
+++ b/bin/varnishd/cache_expire.c
@@ -39,9 +39,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_fetch.c b/bin/varnishd/cache_fetch.c
index dfa43cc..abd9e32 100644
--- a/bin/varnishd/cache_fetch.c
+++ b/bin/varnishd/cache_fetch.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git a/bin/varnishd/cache_gzip.c b/bin/varnishd/cache_gzip.c
index 6a817c2..60e296d 100644
--- a/bin/varnishd/cache_gzip.c
+++ b/bin/varnishd/cache_gzip.c
@@ -68,9 +68,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "svnid.h"
-SVNID("$Id$")
-
#include "vsl.h"
#include "cache.h"
#include "stevedore.h"
diff --git a/bin/varnishd/cache_hash.c b/bin/varnishd/cache_hash.c
index 21007b5..249e1a7 100644
--- a/bin/varnishd/cache_hash.c
+++ b/bin/varnishd/cache_hash.c
@@ -52,9 +52,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff --git a/bin/varnishd/cache_http.c b/bin/varnishd/cache_http.c
index 3a7935b..fc03c1a 100644
--- a/bin/varnishd/cache_http.c
+++ b/bin/varnishd/cache_http.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <errno.h>
#include <unistd.h>
#include <stdarg.h>
diff --git a/bin/varnishd/cache_httpconn.c b/bin/varnishd/cache_httpconn.c
index 9f2640b..514aa3d 100644
--- a/bin/varnishd/cache_httpconn.c
+++ b/bin/varnishd/cache_httpconn.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/bin/varnishd/cache_lck.c b/bin/varnishd/cache_lck.c
index 831ef7b..acb173a 100644
--- a/bin/varnishd/cache_lck.c
+++ b/bin/varnishd/cache_lck.c
@@ -35,9 +35,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_main.c b/bin/varnishd/cache_main.c
index 3387e9e..afd8265 100644
--- a/bin/varnishd/cache_main.c
+++ b/bin/varnishd/cache_main.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_panic.c b/bin/varnishd/cache_panic.c
index 55efa7a..f44584f 100644
--- a/bin/varnishd/cache_panic.c
+++ b/bin/varnishd/cache_panic.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache_pipe.c b/bin/varnishd/cache_pipe.c
index 2658bb7..73d03e8 100644
--- a/bin/varnishd/cache_pipe.c
+++ b/bin/varnishd/cache_pipe.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git a/bin/varnishd/cache_pool.c b/bin/varnishd/cache_pool.c
index 5b52934..f701442 100644
--- a/bin/varnishd/cache_pool.c
+++ b/bin/varnishd/cache_pool.c
@@ -42,9 +42,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <errno.h>
diff --git a/bin/varnishd/cache_response.c b/bin/varnishd/cache_response.c
index fb5e752..5ff645c 100644
--- a/bin/varnishd/cache_response.c
+++ b/bin/varnishd/cache_response.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/bin/varnishd/cache_session.c b/bin/varnishd/cache_session.c
index 17d228d..05aaf19 100644
--- a/bin/varnishd/cache_session.c
+++ b/bin/varnishd/cache_session.c
@@ -40,9 +40,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/bin/varnishd/cache_shmlog.c b/bin/varnishd/cache_shmlog.c
index 62d6f92..dad28b6 100644
--- a/bin/varnishd/cache_shmlog.c
+++ b/bin/varnishd/cache_shmlog.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <unistd.h>
#include <stdarg.h>
diff --git a/bin/varnishd/cache_vary.c b/bin/varnishd/cache_vary.c
index 3a4fa59..28ee29f 100644
--- a/bin/varnishd/cache_vary.c
+++ b/bin/varnishd/cache_vary.c
@@ -54,9 +54,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_vcl.c b/bin/varnishd/cache_vcl.c
index d467661..0b25346 100644
--- a/bin/varnishd/cache_vcl.c
+++ b/bin/varnishd/cache_vcl.c
@@ -33,9 +33,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git a/bin/varnishd/cache_vrt.c b/bin/varnishd/cache_vrt.c
index 7c7e107..0d66435 100644
--- a/bin/varnishd/cache_vrt.c
+++ b/bin/varnishd/cache_vrt.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/bin/varnishd/cache_vrt_re.c b/bin/varnishd/cache_vrt_re.c
index 27d2b4c..97d657c 100644
--- a/bin/varnishd/cache_vrt_re.c
+++ b/bin/varnishd/cache_vrt_re.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache_vrt_var.c b/bin/varnishd/cache_vrt_var.c
index b9b99a9..ec82a06 100644
--- a/bin/varnishd/cache_vrt_var.c
+++ b/bin/varnishd/cache_vrt_var.c
@@ -30,9 +30,6 @@
*/
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache_vrt_vmod.c b/bin/varnishd/cache_vrt_vmod.c
index 77e37e7..4ba4ca8 100644
--- a/bin/varnishd/cache_vrt_vmod.c
+++ b/bin/varnishd/cache_vrt_vmod.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <dlfcn.h>
diff --git a/bin/varnishd/cache_waiter.h b/bin/varnishd/cache_waiter.h
index b69981c..257a70b 100644
--- a/bin/varnishd/cache_waiter.h
+++ b/bin/varnishd/cache_waiter.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct sess;
diff --git a/bin/varnishd/cache_waiter_epoll.c b/bin/varnishd/cache_waiter_epoll.c
index 52ff001..76d06f2 100644
--- a/bin/varnishd/cache_waiter_epoll.c
+++ b/bin/varnishd/cache_waiter_epoll.c
@@ -33,9 +33,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#if defined(HAVE_EPOLL_CTL)
#include <stdio.h>
diff --git a/bin/varnishd/cache_waiter_kqueue.c b/bin/varnishd/cache_waiter_kqueue.c
index ed8451e..b185592 100644
--- a/bin/varnishd/cache_waiter_kqueue.c
+++ b/bin/varnishd/cache_waiter_kqueue.c
@@ -33,9 +33,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#if defined(HAVE_KQUEUE)
#include <stdio.h>
diff --git a/bin/varnishd/cache_waiter_poll.c b/bin/varnishd/cache_waiter_poll.c
index 46b1525..6635cf2 100644
--- a/bin/varnishd/cache_waiter_poll.c
+++ b/bin/varnishd/cache_waiter_poll.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/bin/varnishd/cache_waiter_ports.c b/bin/varnishd/cache_waiter_ports.c
index a3fe421..0858c67 100644
--- a/bin/varnishd/cache_waiter_ports.c
+++ b/bin/varnishd/cache_waiter_ports.c
@@ -31,8 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
#if defined(HAVE_PORT_CREATE)
#include <stdio.h>
diff --git a/bin/varnishd/cache_wrw.c b/bin/varnishd/cache_wrw.c
index 8b79347..10fe645 100644
--- a/bin/varnishd/cache_wrw.c
+++ b/bin/varnishd/cache_wrw.c
@@ -34,9 +34,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/bin/varnishd/cache_ws.c b/bin/varnishd/cache_ws.c
index 62133d4..10f96ba 100644
--- a/bin/varnishd/cache_ws.c
+++ b/bin/varnishd/cache_ws.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/bin/varnishd/common.h b/bin/varnishd/common.h
index d17eca8..ae3ec16 100644
--- a/bin/varnishd/common.h
+++ b/bin/varnishd/common.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct cli;
diff --git a/bin/varnishd/default.vcl b/bin/varnishd/default.vcl
index 919e651..3681ffe 100644
--- a/bin/varnishd/default.vcl
+++ b/bin/varnishd/default.vcl
@@ -26,8 +26,6 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
- *
* The default VCL code.
*
* NB! You do NOT need to copy & paste all of these functions into your
diff --git a/bin/varnishd/hash_classic.c b/bin/varnishd/hash_classic.c
index 0bee770..4b7c928 100644
--- a/bin/varnishd/hash_classic.c
+++ b/bin/varnishd/hash_classic.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishd/hash_critbit.c b/bin/varnishd/hash_critbit.c
index 21f2e5a..a5ad526 100644
--- a/bin/varnishd/hash_critbit.c
+++ b/bin/varnishd/hash_critbit.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/hash_simple_list.c b/bin/varnishd/hash_simple_list.c
index 3c538d4..811aa8a 100644
--- a/bin/varnishd/hash_simple_list.c
+++ b/bin/varnishd/hash_simple_list.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishd/hash_slinger.h b/bin/varnishd/hash_slinger.h
index d5e81e3..65367ad 100644
--- a/bin/varnishd/hash_slinger.h
+++ b/bin/varnishd/hash_slinger.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct sess;
diff --git a/bin/varnishd/heritage.h b/bin/varnishd/heritage.h
index b45e5ee..2198b59 100644
--- a/bin/varnishd/heritage.h
+++ b/bin/varnishd/heritage.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* This file contains the heritage passed when mgt forks cache
*/
diff --git a/bin/varnishd/locks.h b/bin/varnishd/locks.h
index ec56832..1ca024f 100644
--- a/bin/varnishd/locks.h
+++ b/bin/varnishd/locks.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*lint -save -e525 -e539 */
diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
index d4ecc47..7e03657 100644
--- a/bin/varnishd/mgt.h
+++ b/bin/varnishd/mgt.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <stdint.h>
diff --git a/bin/varnishd/mgt_child.c b/bin/varnishd/mgt_child.c
index df8c77f..a7c91a4 100644
--- a/bin/varnishd/mgt_child.c
+++ b/bin/varnishd/mgt_child.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <unistd.h>
#include <stdio.h>
#include <string.h>
diff --git a/bin/varnishd/mgt_cli.c b/bin/varnishd/mgt_cli.c
index 7618e97..aed41b1 100644
--- a/bin/varnishd/mgt_cli.c
+++ b/bin/varnishd/mgt_cli.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdarg.h>
diff --git a/bin/varnishd/mgt_cli.h b/bin/varnishd/mgt_cli.h
index f7a1797..9eef792 100644
--- a/bin/varnishd/mgt_cli.h
+++ b/bin/varnishd/mgt_cli.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/* mgt_child.c */
diff --git a/bin/varnishd/mgt_param.c b/bin/varnishd/mgt_param.c
index 7c5a328..72e5939 100644
--- a/bin/varnishd/mgt_param.c
+++ b/bin/varnishd/mgt_param.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/varnishd/mgt_pool.c b/bin/varnishd/mgt_pool.c
index cd0a371..afa8435 100644
--- a/bin/varnishd/mgt_pool.c
+++ b/bin/varnishd/mgt_pool.c
@@ -42,8 +42,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
#include <stdio.h>
#include <string.h>
#include <limits.h>
diff --git a/bin/varnishd/mgt_sandbox.c b/bin/varnishd/mgt_sandbox.c
index 9f6d343..0922490 100644
--- a/bin/varnishd/mgt_sandbox.c
+++ b/bin/varnishd/mgt_sandbox.c
@@ -44,9 +44,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <syslog.h>
#include <unistd.h>
diff --git a/bin/varnishd/mgt_shmem.c b/bin/varnishd/mgt_shmem.c
index e55bcc2..e0a371d 100644
--- a/bin/varnishd/mgt_shmem.c
+++ b/bin/varnishd/mgt_shmem.c
@@ -86,9 +86,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/mgt_vcc.c b/bin/varnishd/mgt_vcc.c
index 17b49c6..de70939 100644
--- a/bin/varnishd/mgt_vcc.c
+++ b/bin/varnishd/mgt_vcc.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/bin/varnishd/rfc2616.c b/bin/varnishd/rfc2616.c
index a871ae3..457edbe 100644
--- a/bin/varnishd/rfc2616.c
+++ b/bin/varnishd/rfc2616.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/bin/varnishd/steps.h b/bin/varnishd/steps.h
index 9a00b2c..d45b5a7 100644
--- a/bin/varnishd/steps.h
+++ b/bin/varnishd/steps.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*lint -save -e525 -e539 */
diff --git a/bin/varnishd/stevedore.c b/bin/varnishd/stevedore.c
index 8ee4040..5b3d94d 100644
--- a/bin/varnishd/stevedore.c
+++ b/bin/varnishd/stevedore.c
@@ -33,9 +33,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishd/stevedore.h b/bin/varnishd/stevedore.h
index 6036b32..e284530 100644
--- a/bin/varnishd/stevedore.h
+++ b/bin/varnishd/stevedore.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct stevedore;
diff --git a/bin/varnishd/stevedore_utils.c b/bin/varnishd/stevedore_utils.c
index 473d61a..1a4227c 100644
--- a/bin/varnishd/stevedore_utils.c
+++ b/bin/varnishd/stevedore_utils.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/bin/varnishd/storage_file.c b/bin/varnishd/storage_file.c
index c334b6b..63bcdf3 100644
--- a/bin/varnishd/storage_file.c
+++ b/bin/varnishd/storage_file.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/bin/varnishd/storage_malloc.c b/bin/varnishd/storage_malloc.c
index c934ab8..658ca6e 100644
--- a/bin/varnishd/storage_malloc.c
+++ b/bin/varnishd/storage_malloc.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/bin/varnishd/storage_persistent.c b/bin/varnishd/storage_persistent.c
index de28e7a..d5ee060 100644
--- a/bin/varnishd/storage_persistent.c
+++ b/bin/varnishd/storage_persistent.c
@@ -35,9 +35,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <errno.h>
#include <math.h>
#include <stdio.h>
diff --git a/bin/varnishd/storage_persistent_mgt.c b/bin/varnishd/storage_persistent_mgt.c
index e206f1a..240057f 100644
--- a/bin/varnishd/storage_persistent_mgt.c
+++ b/bin/varnishd/storage_persistent_mgt.c
@@ -35,9 +35,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/storage_persistent_silo.c b/bin/varnishd/storage_persistent_silo.c
index 9635628..18e6ea9 100644
--- a/bin/varnishd/storage_persistent_silo.c
+++ b/bin/varnishd/storage_persistent_silo.c
@@ -34,9 +34,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <math.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/bin/varnishd/storage_persistent_subr.c b/bin/varnishd/storage_persistent_subr.c
index 03f6d28..86d1892 100644
--- a/bin/varnishd/storage_persistent_subr.c
+++ b/bin/varnishd/storage_persistent_subr.c
@@ -35,9 +35,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/bin/varnishd/storage_synth.c b/bin/varnishd/storage_synth.c
index 74f22d2..b70e609 100644
--- a/bin/varnishd/storage_synth.c
+++ b/bin/varnishd/storage_synth.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/bin/varnishd/storage_umem.c b/bin/varnishd/storage_umem.c
index 4ec6e1d..016f5c9 100644
--- a/bin/varnishd/storage_umem.c
+++ b/bin/varnishd/storage_umem.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifdef HAVE_LIBUMEM
#include <sys/types.h>
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index 3597867..aa9d876 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/stat.h>
#include <ctype.h>
diff --git a/bin/varnishd/vparam.h b/bin/varnishd/vparam.h
index 47eae29..fefbba1 100644
--- a/bin/varnishd/vparam.h
+++ b/bin/varnishd/vparam.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct parspec;
diff --git a/bin/varnishd/vsm.c b/bin/varnishd/vsm.c
index 3771aab..4312d83 100644
--- a/bin/varnishd/vsm.c
+++ b/bin/varnishd/vsm.c
@@ -47,9 +47,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <unistd.h>
#include <string.h>
#include <stdio.h>
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index b05550a..8300e43 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index f428a0b..bfda305 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <curses.h>
#include <errno.h>
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 7798d47..17474fc 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 80771aa..81593c6 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index da6029f..69ec4de 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 717e9e6..0124705 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -61,9 +61,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <signal.h>
#include <stdio.h>
diff --git a/bin/varnishreplay/Makefile.am b/bin/varnishreplay/Makefile.am
index d13916c..bca6b10 100644
--- a/bin/varnishreplay/Makefile.am
+++ b/bin/varnishreplay/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishreplay/varnishreplay.c b/bin/varnishreplay/varnishreplay.c
index 70a4e3a..b582d91 100644
--- a/bin/varnishreplay/varnishreplay.c
+++ b/bin/varnishreplay/varnishreplay.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/signal.h>
#include <sys/uio.h>
diff --git a/bin/varnishsizes/Makefile.am b/bin/varnishsizes/Makefile.am
index a99b7cc..cb0c013 100644
--- a/bin/varnishsizes/Makefile.am
+++ b/bin/varnishsizes/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishsizes/varnishsizes.c b/bin/varnishsizes/varnishsizes.c
index 4531997..8fd15bc 100644
--- a/bin/varnishsizes/varnishsizes.c
+++ b/bin/varnishsizes/varnishsizes.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <curses.h>
#include <errno.h>
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index f6b9d49..ae4da56 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 139b64a..d1c7545 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/time.h>
#include <errno.h>
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 8ce1690..2672255 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/time.h>
#include <curses.h>
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index d20f29e..e538120 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
TESTS_PARALLELISM = 3
check: varnishtest
diff --git a/bin/varnishtest/tests/README b/bin/varnishtest/tests/README
index 48924a2..dc08fc5 100644
--- a/bin/varnishtest/tests/README
+++ b/bin/varnishtest/tests/README
@@ -1,5 +1,3 @@
-# $Id$
-
Test-scripts for varnishtest
============================
diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc
index d53be0f..d368014 100644
--- a/bin/varnishtest/tests/a00000.vtc
+++ b/bin/varnishtest/tests/a00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "basic default HTTP transactions"
+varnishtest "basic default HTTP transactions"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00001.vtc b/bin/varnishtest/tests/a00001.vtc
index ec325a3..06b8ae5 100644
--- a/bin/varnishtest/tests/a00001.vtc
+++ b/bin/varnishtest/tests/a00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "basic default HTTP transactions with expect"
+varnishtest "basic default HTTP transactions with expect"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00002.vtc b/bin/varnishtest/tests/a00002.vtc
index 4de3238..e0b4759 100644
--- a/bin/varnishtest/tests/a00002.vtc
+++ b/bin/varnishtest/tests/a00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "basic default HTTP transactions with expect and options"
+varnishtest "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 365e29f..7462fb1 100644
--- a/bin/varnishtest/tests/a00003.vtc
+++ b/bin/varnishtest/tests/a00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "dual independent HTTP transactions"
+varnishtest "dual independent HTTP transactions"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00004.vtc b/bin/varnishtest/tests/a00004.vtc
index d82ff50..01cd868 100644
--- a/bin/varnishtest/tests/a00004.vtc
+++ b/bin/varnishtest/tests/a00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "dual shared server HTTP transactions"
+varnishtest "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 8b0e1c7..e44a7e2 100644
--- a/bin/varnishtest/tests/a00005.vtc
+++ b/bin/varnishtest/tests/a00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "dual shared client HTTP transactions"
+varnishtest "dual shared client HTTP transactions"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00006.vtc b/bin/varnishtest/tests/a00006.vtc
index 1b61a7a..5db297b 100644
--- a/bin/varnishtest/tests/a00006.vtc
+++ b/bin/varnishtest/tests/a00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "bidirectional message bodies"
+varnishtest "bidirectional message bodies"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00007.vtc b/bin/varnishtest/tests/a00007.vtc
index 8715e8d..81d80af 100644
--- a/bin/varnishtest/tests/a00007.vtc
+++ b/bin/varnishtest/tests/a00007.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "TCP reuse"
+varnishtest "TCP reuse"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00008.vtc b/bin/varnishtest/tests/a00008.vtc
index 0f5a4ef..3a581c8 100644
--- a/bin/varnishtest/tests/a00008.vtc
+++ b/bin/varnishtest/tests/a00008.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Sema operations"
+varnishtest "Sema operations"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index 0450789..90569cc 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -1,5 +1,3 @@
-# $Id$
-
-test "See that the VCL compiler works"
+varnishtest "See that the VCL compiler works"
shell "cd ${topbuild}/bin/varnishd && ./varnishd -b 127.0.0.1:80 -C -n ${tmpdir} > /dev/null"
diff --git a/bin/varnishtest/tests/a00010.vtc b/bin/varnishtest/tests/a00010.vtc
index cb3acf0..1200a69 100644
--- a/bin/varnishtest/tests/a00010.vtc
+++ b/bin/varnishtest/tests/a00010.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "simply test that the framework support \0"
+varnishtest "simply test that the framework support \0"
server s1 {
rxreq
@@ -20,4 +18,3 @@ client c1 -connect ${s1_sock} {
client c1 -run
server s1 -wait
-
diff --git a/bin/varnishtest/tests/a00011.vtc b/bin/varnishtest/tests/a00011.vtc
index 79a136f..9e07f83 100644
--- a/bin/varnishtest/tests/a00011.vtc
+++ b/bin/varnishtest/tests/a00011.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test vtc gzip support"
+varnishtest "test vtc gzip support"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00000.vtc b/bin/varnishtest/tests/b00000.vtc
index 0aa6720..1f4f766 100644
--- a/bin/varnishtest/tests/b00000.vtc
+++ b/bin/varnishtest/tests/b00000.vtc
@@ -1,8 +1,4 @@
-# Test that we get anything through at all
-#
-# $Id$
-
-test "Does anything get through at all ?"
+varnishtest "Does anything get through at all ?"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00001.vtc b/bin/varnishtest/tests/b00001.vtc
index 16a3406..41dbe63 100644
--- a/bin/varnishtest/tests/b00001.vtc
+++ b/bin/varnishtest/tests/b00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that a pipe transaction works"
+varnishtest "Check that a pipe transaction works"
server s1 -repeat 1 {
rxreq
diff --git a/bin/varnishtest/tests/b00002.vtc b/bin/varnishtest/tests/b00002.vtc
index f1b5f48..243de19 100644
--- a/bin/varnishtest/tests/b00002.vtc
+++ b/bin/varnishtest/tests/b00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that a pass transaction works"
+varnishtest "Check that a pass transaction works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00003.vtc b/bin/varnishtest/tests/b00003.vtc
index 6de3ee4..8b9375d 100644
--- a/bin/varnishtest/tests/b00003.vtc
+++ b/bin/varnishtest/tests/b00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that a cache fetch + hit transaction works"
+varnishtest "Check that a cache fetch + hit transaction works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00004.vtc b/bin/varnishtest/tests/b00004.vtc
index 66a3e74..2a13a84 100644
--- a/bin/varnishtest/tests/b00004.vtc
+++ b/bin/varnishtest/tests/b00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Torture Varnish with start/stop commands"
+varnishtest "Torture Varnish with start/stop commands"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00005.vtc b/bin/varnishtest/tests/b00005.vtc
index f6dfc7d..2824fc2 100644
--- a/bin/varnishtest/tests/b00005.vtc
+++ b/bin/varnishtest/tests/b00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that -s works"
+varnishtest "Check that -s works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00006.vtc b/bin/varnishtest/tests/b00006.vtc
index 530a3cd..aea0494 100644
--- a/bin/varnishtest/tests/b00006.vtc
+++ b/bin/varnishtest/tests/b00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that -s malloc works"
+varnishtest "Check that -s malloc works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00007.vtc b/bin/varnishtest/tests/b00007.vtc
index f089108..58740c6 100644
--- a/bin/varnishtest/tests/b00007.vtc
+++ b/bin/varnishtest/tests/b00007.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check chunked encoding from backend works"
+varnishtest "Check chunked encoding from backend works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00008.vtc b/bin/varnishtest/tests/b00008.vtc
index ed4cf0f..3d0c7e5 100644
--- a/bin/varnishtest/tests/b00008.vtc
+++ b/bin/varnishtest/tests/b00008.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test CLI help and parameter functions"
+varnishtest "Test CLI help and parameter functions"
varnish v1 -arg "-b ${bad_ip}:9080"
diff --git a/bin/varnishtest/tests/b00009.vtc b/bin/varnishtest/tests/b00009.vtc
index 8afe96f..02a0b57 100644
--- a/bin/varnishtest/tests/b00009.vtc
+++ b/bin/varnishtest/tests/b00009.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check poll acceptor"
+varnishtest "Check poll acceptor"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00010.vtc b/bin/varnishtest/tests/b00010.vtc
index c6be22e..b27dd42 100644
--- a/bin/varnishtest/tests/b00010.vtc
+++ b/bin/varnishtest/tests/b00010.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check simple list hasher"
+varnishtest "Check simple list hasher"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00011.vtc b/bin/varnishtest/tests/b00011.vtc
index ef024b7..9c4e2d3 100644
--- a/bin/varnishtest/tests/b00011.vtc
+++ b/bin/varnishtest/tests/b00011.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check HTTP/1.0 EOF transmission"
+varnishtest "Check HTTP/1.0 EOF transmission"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00012.vtc b/bin/varnishtest/tests/b00012.vtc
index a41294e..967ed85 100644
--- a/bin/varnishtest/tests/b00012.vtc
+++ b/bin/varnishtest/tests/b00012.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check pipelining"
+varnishtest "Check pipelining"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00013.vtc b/bin/varnishtest/tests/b00013.vtc
index eac5436..57250ad 100644
--- a/bin/varnishtest/tests/b00013.vtc
+++ b/bin/varnishtest/tests/b00013.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check read-head / partial pipelining"
+varnishtest "Check read-head / partial pipelining"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00014.vtc b/bin/varnishtest/tests/b00014.vtc
index 1f83bd5..b68c79e 100644
--- a/bin/varnishtest/tests/b00014.vtc
+++ b/bin/varnishtest/tests/b00014.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check -f command line arg"
+varnishtest "Check -f command line arg"
server s1 {
diff --git a/bin/varnishtest/tests/b00015.vtc b/bin/varnishtest/tests/b00015.vtc
index d5c9aeb..6e9d693 100644
--- a/bin/varnishtest/tests/b00015.vtc
+++ b/bin/varnishtest/tests/b00015.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check synthetic error page caching"
+varnishtest "Check synthetic error page caching"
# First test that an internally generated error is not cached
diff --git a/bin/varnishtest/tests/b00016.vtc b/bin/varnishtest/tests/b00016.vtc
index 848ae9c..db68663 100644
--- a/bin/varnishtest/tests/b00016.vtc
+++ b/bin/varnishtest/tests/b00016.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check naming of backends"
+varnishtest "Check naming of backends"
varnish v1 -vcl {
backend foo {
diff --git a/bin/varnishtest/tests/b00017.vtc b/bin/varnishtest/tests/b00017.vtc
index c46fa1c..9edcbc5 100644
--- a/bin/varnishtest/tests/b00017.vtc
+++ b/bin/varnishtest/tests/b00017.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that we close one error"
+varnishtest "Check that we close one error"
varnish v1 -vcl {
backend foo {
diff --git a/bin/varnishtest/tests/b00018.vtc b/bin/varnishtest/tests/b00018.vtc
index 24329ef..bbd7c0e 100644
--- a/bin/varnishtest/tests/b00018.vtc
+++ b/bin/varnishtest/tests/b00018.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that error in vcl_fetch works"
+varnishtest "Check that error in vcl_fetch works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00019.vtc b/bin/varnishtest/tests/b00019.vtc
index 84a1f32..2572a57 100644
--- a/bin/varnishtest/tests/b00019.vtc
+++ b/bin/varnishtest/tests/b00019.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that max_restarts works and that we don't fall over"
+varnishtest "Check that max_restarts works and that we don't fall over"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00020.vtc b/bin/varnishtest/tests/b00020.vtc
index cfb2f69..d937ac0 100644
--- a/bin/varnishtest/tests/b00020.vtc
+++ b/bin/varnishtest/tests/b00020.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check the between_bytes_timeout behaves from parameters"
+varnishtest "Check the between_bytes_timeout behaves from parameters"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00021.vtc b/bin/varnishtest/tests/b00021.vtc
index f0d868d..87d91e3 100644
--- a/bin/varnishtest/tests/b00021.vtc
+++ b/bin/varnishtest/tests/b00021.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check the between_bytes_timeout behaves from vcl"
+varnishtest "Check the between_bytes_timeout behaves from vcl"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00022.vtc b/bin/varnishtest/tests/b00022.vtc
index 51ae65a..aa625b6 100644
--- a/bin/varnishtest/tests/b00022.vtc
+++ b/bin/varnishtest/tests/b00022.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check the between_bytes_timeout behaves from backend definition"
+varnishtest "Check the between_bytes_timeout behaves from backend definition"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00023.vtc b/bin/varnishtest/tests/b00023.vtc
index e780b04..7685f66 100644
--- a/bin/varnishtest/tests/b00023.vtc
+++ b/bin/varnishtest/tests/b00023.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that the first_byte_timeout works from parameters"
+varnishtest "Check that the first_byte_timeout works from parameters"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00024.vtc b/bin/varnishtest/tests/b00024.vtc
index a3e763b..bbca487 100644
--- a/bin/varnishtest/tests/b00024.vtc
+++ b/bin/varnishtest/tests/b00024.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that the first_byte_timeout works from vcl"
+varnishtest "Check that the first_byte_timeout works from vcl"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00025.vtc b/bin/varnishtest/tests/b00025.vtc
index e2c34e9..3ba0e64 100644
--- a/bin/varnishtest/tests/b00025.vtc
+++ b/bin/varnishtest/tests/b00025.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that the first_byte_timeout works from backend definition"
+varnishtest "Check that the first_byte_timeout works from backend definition"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00026.vtc b/bin/varnishtest/tests/b00026.vtc
index d2c281b..1cc1998 100644
--- a/bin/varnishtest/tests/b00026.vtc
+++ b/bin/varnishtest/tests/b00026.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check the precedence for timeouts"
+varnishtest "Check the precedence for timeouts"
feature SO_RCVTIMEO_WORKS
diff --git a/bin/varnishtest/tests/b00027.vtc b/bin/varnishtest/tests/b00027.vtc
index c016642..4076019 100644
--- a/bin/varnishtest/tests/b00027.vtc
+++ b/bin/varnishtest/tests/b00027.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test backend transmission corner cases"
+varnishtest "test backend transmission corner cases"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00028.vtc b/bin/varnishtest/tests/b00028.vtc
index 85a8a01..20e30aa 100644
--- a/bin/varnishtest/tests/b00028.vtc
+++ b/bin/varnishtest/tests/b00028.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "regexp match and no-match"
+varnishtest "regexp match and no-match"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00029.vtc b/bin/varnishtest/tests/b00029.vtc
index 1fb570f..8df3997 100644
--- a/bin/varnishtest/tests/b00029.vtc
+++ b/bin/varnishtest/tests/b00029.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test orderly connection closure"
+varnishtest "Test orderly connection closure"
server s1 {
diff --git a/bin/varnishtest/tests/b00030.vtc b/bin/varnishtest/tests/b00030.vtc
index 8cc5c7f..fcd0356 100644
--- a/bin/varnishtest/tests/b00030.vtc
+++ b/bin/varnishtest/tests/b00030.vtc
@@ -1,9 +1,8 @@
-# $Id$
+varnishtest "Test formatting of timestamps"
+
# We can't test the value of x-timestamp, but this should fail
# if we can't set the header at all.
-test "Test formatting of timestamps"
-
server s1 {
rxreq
txresp
diff --git a/bin/varnishtest/tests/b00031.vtc b/bin/varnishtest/tests/b00031.vtc
index 6719e85..9dcb83e 100644
--- a/bin/varnishtest/tests/b00031.vtc
+++ b/bin/varnishtest/tests/b00031.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test X-Forward-For headers"
+varnishtest "Test X-Forward-For headers"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/b00032.vtc b/bin/varnishtest/tests/b00032.vtc
index 25e1a62..949bcfa 100644
--- a/bin/varnishtest/tests/b00032.vtc
+++ b/bin/varnishtest/tests/b00032.vtc
@@ -1,5 +1,3 @@
-# $Id$
-
-test "CLI coverage test"
+varnishtest "CLI coverage test"
varnish v1 -cliok storage.list
diff --git a/bin/varnishtest/tests/b00033.vtc b/bin/varnishtest/tests/b00033.vtc
index c044f9d..4077047 100644
--- a/bin/varnishtest/tests/b00033.vtc
+++ b/bin/varnishtest/tests/b00033.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "classic hash code coverage"
+varnishtest "classic hash code coverage"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00001.vtc b/bin/varnishtest/tests/c00001.vtc
index 15e5860..d9b6c41 100644
--- a/bin/varnishtest/tests/c00001.vtc
+++ b/bin/varnishtest/tests/c00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test VCL regsub()"
+varnishtest "Test VCL regsub()"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00002.vtc b/bin/varnishtest/tests/c00002.vtc
index 696ad67..6e633e0 100644
--- a/bin/varnishtest/tests/c00002.vtc
+++ b/bin/varnishtest/tests/c00002.vtc
@@ -1,8 +1,4 @@
-# Test that we get anything through at all
-#
-# $Id$
-
-test "Check that all thread pools all get started and get minimum threads"
+varnishtest "Check that all thread pools all get started and get minimum threads"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00003.vtc b/bin/varnishtest/tests/c00003.vtc
index 8af74dd..598eae9 100644
--- a/bin/varnishtest/tests/c00003.vtc
+++ b/bin/varnishtest/tests/c00003.vtc
@@ -1,8 +1,4 @@
-# Test that we get anything through at all
-#
-# $Id$
-
-test "Check that we start if at least one listen address works"
+varnishtest "Check that we start if at least one listen address works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00004.vtc b/bin/varnishtest/tests/c00004.vtc
index c03c079..6b47ad5 100644
--- a/bin/varnishtest/tests/c00004.vtc
+++ b/bin/varnishtest/tests/c00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Vary functionality"
+varnishtest "Test Vary functionality"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00005.vtc b/bin/varnishtest/tests/c00005.vtc
index f55d190..7a7965c 100644
--- a/bin/varnishtest/tests/c00005.vtc
+++ b/bin/varnishtest/tests/c00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test simple ACL"
+varnishtest "Test simple ACL"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00006.vtc b/bin/varnishtest/tests/c00006.vtc
index e3227f5..c2c8ec2 100644
--- a/bin/varnishtest/tests/c00006.vtc
+++ b/bin/varnishtest/tests/c00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test banning a url"
+varnishtest "Test banning a url"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00007.vtc b/bin/varnishtest/tests/c00007.vtc
index ab66b10..d9cd46f 100644
--- a/bin/varnishtest/tests/c00007.vtc
+++ b/bin/varnishtest/tests/c00007.vtc
@@ -1,5 +1,3 @@
-# $Id$
-
-test "Test banning a hash"
+varnishtest "Test banning a hash"
varnish v1 -arg "-b 127.0.0.1:80 -a 127.0.0.1:0" -start -clierr 101 "ban.hash foo"
diff --git a/bin/varnishtest/tests/c00008.vtc b/bin/varnishtest/tests/c00008.vtc
index 8554bb6..3045a5b 100644
--- a/bin/varnishtest/tests/c00008.vtc
+++ b/bin/varnishtest/tests/c00008.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test If-Modified-Since"
+varnishtest "Test If-Modified-Since"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 35e2391..295b092 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test restarts"
+varnishtest "Test restarts"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00010.vtc b/bin/varnishtest/tests/c00010.vtc
index e476c7e..81ed5b6 100644
--- a/bin/varnishtest/tests/c00010.vtc
+++ b/bin/varnishtest/tests/c00010.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test pass from hit"
+varnishtest "Test pass from hit"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index ab03d6a..1dd34a8 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test hit for pass (pass from fetch)"
+varnishtest "Test hit for pass (pass from fetch)"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00012.vtc b/bin/varnishtest/tests/c00012.vtc
index 967474a..24326d8 100644
--- a/bin/varnishtest/tests/c00012.vtc
+++ b/bin/varnishtest/tests/c00012.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test pass from miss"
+varnishtest "Test pass from miss"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00013.vtc b/bin/varnishtest/tests/c00013.vtc
index 0368897..94c86ca 100644
--- a/bin/varnishtest/tests/c00013.vtc
+++ b/bin/varnishtest/tests/c00013.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test parking second request on backend delay"
+varnishtest "Test parking second request on backend delay"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index b06d3df..ced8117 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test parking second request on backend delay, then pass"
+varnishtest "Test parking second request on backend delay, then pass"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00015.vtc b/bin/varnishtest/tests/c00015.vtc
index bd2f618..755669b 100644
--- a/bin/varnishtest/tests/c00015.vtc
+++ b/bin/varnishtest/tests/c00015.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test switching VCLs"
+varnishtest "Test switching VCLs"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00016.vtc b/bin/varnishtest/tests/c00016.vtc
index 622e548..d028a64 100644
--- a/bin/varnishtest/tests/c00016.vtc
+++ b/bin/varnishtest/tests/c00016.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Connection header handling"
+varnishtest "Test Connection header handling"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00017.vtc b/bin/varnishtest/tests/c00017.vtc
index ede7462..7e6f11f 100644
--- a/bin/varnishtest/tests/c00017.vtc
+++ b/bin/varnishtest/tests/c00017.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Backend Polling"
+varnishtest "Test Backend Polling"
server s1 {
# Probes
diff --git a/bin/varnishtest/tests/c00018.vtc b/bin/varnishtest/tests/c00018.vtc
index 558f550..4351748 100644
--- a/bin/varnishtest/tests/c00018.vtc
+++ b/bin/varnishtest/tests/c00018.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check Expect headers"
+varnishtest "Check Expect headers"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00019.vtc b/bin/varnishtest/tests/c00019.vtc
index a6989fd..a27bb8e 100644
--- a/bin/varnishtest/tests/c00019.vtc
+++ b/bin/varnishtest/tests/c00019.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check ban counters and duplicate ban elimination"
+varnishtest "Check ban counters and duplicate ban elimination"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00020.vtc b/bin/varnishtest/tests/c00020.vtc
index e48b6e3..31875b2 100644
--- a/bin/varnishtest/tests/c00020.vtc
+++ b/bin/varnishtest/tests/c00020.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test -h critbit a bit"
+varnishtest "Test -h critbit a bit"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00021.vtc b/bin/varnishtest/tests/c00021.vtc
index 1615f8c..c8bcbe5 100644
--- a/bin/varnishtest/tests/c00021.vtc
+++ b/bin/varnishtest/tests/c00021.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test banning a url with cli:ban"
+varnishtest "Test banning a url with cli:ban"
server s1 {
rxreq
@@ -122,5 +120,3 @@ client c1 {
expect resp.http.foo == bar8
expect resp.bodylen == 8
} -run
-
-
diff --git a/bin/varnishtest/tests/c00022.vtc b/bin/varnishtest/tests/c00022.vtc
index fda0f7c..4097c65 100644
--- a/bin/varnishtest/tests/c00022.vtc
+++ b/bin/varnishtest/tests/c00022.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test banning a url with VCL ban"
+varnishtest "Test banning a url with VCL ban"
server s1 {
rxreq
@@ -178,5 +176,3 @@ client c1 {
expect resp.http.foo == bar8
expect resp.bodylen == 8
} -run
-
-
diff --git a/bin/varnishtest/tests/c00023.vtc b/bin/varnishtest/tests/c00023.vtc
index b4d418a..6bed8e3 100644
--- a/bin/varnishtest/tests/c00023.vtc
+++ b/bin/varnishtest/tests/c00023.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test -h critbit for digest edges"
+varnishtest "Test -h critbit for digest edges"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00024.vtc b/bin/varnishtest/tests/c00024.vtc
index 9e502a6..4b1bdac 100644
--- a/bin/varnishtest/tests/c00024.vtc
+++ b/bin/varnishtest/tests/c00024.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test restart in vcl_error"
+varnishtest "Test restart in vcl_error"
server s1 {
rxreq
@@ -38,4 +36,3 @@ client c1 {
rxresp
expect resp.status == 200
} -run
-
diff --git a/bin/varnishtest/tests/c00025.vtc b/bin/varnishtest/tests/c00025.vtc
index 8eb7085..668fdc2 100644
--- a/bin/varnishtest/tests/c00025.vtc
+++ b/bin/varnishtest/tests/c00025.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test If-None-Match"
+varnishtest "Test If-None-Match"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00026.vtc b/bin/varnishtest/tests/c00026.vtc
index 16ac1f3..427efe4 100644
--- a/bin/varnishtest/tests/c00026.vtc
+++ b/bin/varnishtest/tests/c00026.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Combination of If-None-Match and If-Modified-Since"
+varnishtest "Test Combination of If-None-Match and If-Modified-Since"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00027.vtc b/bin/varnishtest/tests/c00027.vtc
index 969d439..5f49fcb 100644
--- a/bin/varnishtest/tests/c00027.vtc
+++ b/bin/varnishtest/tests/c00027.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test eviction"
+varnishtest "Test eviction"
server s1 {
rxreq
@@ -43,4 +41,3 @@ client c1 {
rxresp
expect resp.status == 200
} -run
-
diff --git a/bin/varnishtest/tests/c00028.vtc b/bin/varnishtest/tests/c00028.vtc
index 765d017..7e2224f 100644
--- a/bin/varnishtest/tests/c00028.vtc
+++ b/bin/varnishtest/tests/c00028.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that we can't recurse restarts forever"
+varnishtest "Test that we can't recurse restarts forever"
varnish v1 -vcl {
backend bad {
@@ -20,4 +18,3 @@ client c1 {
rxresp
expect resp.status == 503
} -run
-
diff --git a/bin/varnishtest/tests/c00029.vtc b/bin/varnishtest/tests/c00029.vtc
index 8d59f88..7396a2b 100644
--- a/bin/varnishtest/tests/c00029.vtc
+++ b/bin/varnishtest/tests/c00029.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that saintmode_threshold correctly marks a backend as sick"
+varnishtest "Test that saintmode_threshold correctly marks a backend as sick"
server s1 {
rxreq
@@ -107,4 +105,3 @@ client c1 {
expect resp.http.X-Restarts == "0"
} -run
-
diff --git a/bin/varnishtest/tests/c00030.vtc b/bin/varnishtest/tests/c00030.vtc
index d5a6a7a..adb39ee 100644
--- a/bin/varnishtest/tests/c00030.vtc
+++ b/bin/varnishtest/tests/c00030.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that saintmode_threshold in VCL"
+varnishtest "Test that saintmode_threshold in VCL"
server s1 {
rxreq
@@ -111,4 +109,3 @@ client c1 {
expect resp.http.X-Restarts == "0"
} -run
-
diff --git a/bin/varnishtest/tests/c00031.vtc b/bin/varnishtest/tests/c00031.vtc
index 8366154..1dd8213 100644
--- a/bin/varnishtest/tests/c00031.vtc
+++ b/bin/varnishtest/tests/c00031.vtc
@@ -1,8 +1,4 @@
-# Test that we get anything through at all
-#
-# $Id$
-
-test "Worker thread stack size setting"
+varnishtest "Worker thread stack size setting"
server s1 {
rxreq
@@ -16,4 +12,3 @@ client c1 {
rxresp
expect resp.status == 200
} -run
-
diff --git a/bin/varnishtest/tests/c00032.vtc b/bin/varnishtest/tests/c00032.vtc
index e207ac6..621758f 100644
--- a/bin/varnishtest/tests/c00032.vtc
+++ b/bin/varnishtest/tests/c00032.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Rollback"
+varnishtest "Test Rollback"
server s1 {
diff --git a/bin/varnishtest/tests/c00033.vtc b/bin/varnishtest/tests/c00033.vtc
index f9786a3..d93a6d0 100644
--- a/bin/varnishtest/tests/c00033.vtc
+++ b/bin/varnishtest/tests/c00033.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Inline C access to purges (could be retired)"
+varnishtest "Inline C access to purges (could be retired)"
server s1 {
rxreq
@@ -85,5 +83,3 @@ client c1 {
expect resp.bodylen == 6
} -run
-
-
diff --git a/bin/varnishtest/tests/c00034.vtc b/bin/varnishtest/tests/c00034.vtc
index 3ec70df..faf60fb 100644
--- a/bin/varnishtest/tests/c00034.vtc
+++ b/bin/varnishtest/tests/c00034.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Range headers"
+varnishtest "Range headers"
server s1 {
rxreq
@@ -87,4 +85,3 @@ client c1 {
expect resp.status == 206
expect resp.bodylen == 100
} -run
-
diff --git a/bin/varnishtest/tests/c00035.vtc b/bin/varnishtest/tests/c00035.vtc
index 4305214..83400f1 100644
--- a/bin/varnishtest/tests/c00035.vtc
+++ b/bin/varnishtest/tests/c00035.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Dropping polling of a backend"
+varnishtest "Dropping polling of a backend"
server s1 -repeat 1 {
rxreq
diff --git a/bin/varnishtest/tests/c00036.vtc b/bin/varnishtest/tests/c00036.vtc
index 148a084..9f2544c 100644
--- a/bin/varnishtest/tests/c00036.vtc
+++ b/bin/varnishtest/tests/c00036.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Backend close retry"
+varnishtest "Backend close retry"
server s1 -repeat 1 {
rxreq
diff --git a/bin/varnishtest/tests/c00037.vtc b/bin/varnishtest/tests/c00037.vtc
index 84736df..e854a3b 100644
--- a/bin/varnishtest/tests/c00037.vtc
+++ b/bin/varnishtest/tests/c00037.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test req.hash_always_miss in vcl_recv"
+varnishtest "Test req.hash_always_miss in vcl_recv"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00038.vtc b/bin/varnishtest/tests/c00038.vtc
index f2b5786..07e2657 100644
--- a/bin/varnishtest/tests/c00038.vtc
+++ b/bin/varnishtest/tests/c00038.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test req.hash_ignore_busy in vcl_recv"
+varnishtest "Test req.hash_ignore_busy in vcl_recv"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00039.vtc b/bin/varnishtest/tests/c00039.vtc
index a53742f..f8bba06 100644
--- a/bin/varnishtest/tests/c00039.vtc
+++ b/bin/varnishtest/tests/c00039.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "request req and hdr length limits"
+varnishtest "request req and hdr length limits"
server s1 {
rxreq
@@ -51,4 +49,3 @@ client c1 {
# XXX: that the backend summarily closes on us. Adding one
# XXX: char to the above test, should cause that.
} -run
-
diff --git a/bin/varnishtest/tests/c00040.vtc b/bin/varnishtest/tests/c00040.vtc
index 9faf18e..b6af9e2 100644
--- a/bin/varnishtest/tests/c00040.vtc
+++ b/bin/varnishtest/tests/c00040.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "request resp and hdr length limits"
+varnishtest "request resp and hdr length limits"
server s1 {
rxreq
@@ -81,4 +79,3 @@ client c1 {
rxresp
expect resp.status == 503
} -run
-
diff --git a/bin/varnishtest/tests/c00041.vtc b/bin/varnishtest/tests/c00041.vtc
index cb7b1cb..78e8af2 100644
--- a/bin/varnishtest/tests/c00041.vtc
+++ b/bin/varnishtest/tests/c00041.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test purging from vcl"
+varnishtest "test purging from vcl"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/c00042.vtc b/bin/varnishtest/tests/c00042.vtc
index de94e38..ae39d24 100644
--- a/bin/varnishtest/tests/c00042.vtc
+++ b/bin/varnishtest/tests/c00042.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "using req.ttl to force fetch"
+varnishtest "using req.ttl to force fetch"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index e929493..9aa9f55 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI test with no ESI content"
+varnishtest "ESI test with no ESI content"
server s1 {
diff --git a/bin/varnishtest/tests/e00001.vtc b/bin/varnishtest/tests/e00001.vtc
index 3031620..9b6d1de 100644
--- a/bin/varnishtest/tests/e00001.vtc
+++ b/bin/varnishtest/tests/e00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI:remove"
+varnishtest "ESI:remove"
server s1 {
diff --git a/bin/varnishtest/tests/e00002.vtc b/bin/varnishtest/tests/e00002.vtc
index 69d0406..3f755d1 100644
--- a/bin/varnishtest/tests/e00002.vtc
+++ b/bin/varnishtest/tests/e00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI CDATA"
+varnishtest "ESI CDATA"
server s1 {
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index 29c7f6f..805219f 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI include"
+varnishtest "ESI include"
server s1 {
diff --git a/bin/varnishtest/tests/e00004.vtc b/bin/varnishtest/tests/e00004.vtc
index 5b12ddd..1643e14 100644
--- a/bin/varnishtest/tests/e00004.vtc
+++ b/bin/varnishtest/tests/e00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI commented include"
+varnishtest "ESI commented include"
server s1 {
diff --git a/bin/varnishtest/tests/e00005.vtc b/bin/varnishtest/tests/e00005.vtc
index 2584a16..a47837d 100644
--- a/bin/varnishtest/tests/e00005.vtc
+++ b/bin/varnishtest/tests/e00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI relative include"
+varnishtest "ESI relative include"
server s1 {
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index cb621a9..804ee5a 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI include with http://"
+varnishtest "ESI include with http://"
server s1 {
diff --git a/bin/varnishtest/tests/e00007.vtc b/bin/varnishtest/tests/e00007.vtc
index c2f0cb2..2418f81 100644
--- a/bin/varnishtest/tests/e00007.vtc
+++ b/bin/varnishtest/tests/e00007.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI spanning storage bits"
+varnishtest "ESI spanning storage bits"
# NB! The layout of the body in the response is very carefully
# NB! tuned to give the desired code coverage.
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 1fd844b..9c8770f 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI parsing errors"
+varnishtest "ESI parsing errors"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index 7a70743..8a7927d 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI binary detector"
+varnishtest "ESI binary detector"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00010.vtc b/bin/varnishtest/tests/e00010.vtc
index d2cc2d6..2cc0d78 100644
--- a/bin/varnishtest/tests/e00010.vtc
+++ b/bin/varnishtest/tests/e00010.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ignoring non esi elements"
+varnishtest "Ignoring non esi elements"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00011.vtc b/bin/varnishtest/tests/e00011.vtc
index 5609ee1..e725498 100644
--- a/bin/varnishtest/tests/e00011.vtc
+++ b/bin/varnishtest/tests/e00011.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Make sure that PASS'ed ESI requests use GET for includes"
+varnishtest "Make sure that PASS'ed ESI requests use GET for includes"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00012.vtc b/bin/varnishtest/tests/e00012.vtc
index 1476b64..97672f1 100644
--- a/bin/varnishtest/tests/e00012.vtc
+++ b/bin/varnishtest/tests/e00012.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI includes for pre HTTP/1.1 cannot used chunked encoding"
+varnishtest "ESI includes for pre HTTP/1.1 cannot used chunked encoding"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00013.vtc b/bin/varnishtest/tests/e00013.vtc
index 3816d99..d3de7a4 100644
--- a/bin/varnishtest/tests/e00013.vtc
+++ b/bin/varnishtest/tests/e00013.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "All white-space object, in multiple storage segments"
+varnishtest "All white-space object, in multiple storage segments"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00014.vtc b/bin/varnishtest/tests/e00014.vtc
index d641e74..0c36700 100644
--- a/bin/varnishtest/tests/e00014.vtc
+++ b/bin/varnishtest/tests/e00014.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check <esi: detector"
+varnishtest "Check <esi: detector"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index 4a05557..d658d61 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI requests turned off"
+varnishtest "ESI requests turned off"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index 77fdb6a..f9a3901 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI request can't be turned off midstream"
+varnishtest "ESI request can't be turned off midstream"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00017.vtc b/bin/varnishtest/tests/e00017.vtc
index 129f2e0..ac32d5f 100644
--- a/bin/varnishtest/tests/e00017.vtc
+++ b/bin/varnishtest/tests/e00017.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Aggressive use of ESI include"
+varnishtest "Aggressive use of ESI include"
server s1 {
diff --git a/bin/varnishtest/tests/e00018.vtc b/bin/varnishtest/tests/e00018.vtc
index 5157694..305ff0f 100644
--- a/bin/varnishtest/tests/e00018.vtc
+++ b/bin/varnishtest/tests/e00018.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test XML 1.0 entity references"
+varnishtest "Test XML 1.0 entity references"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 6443e98..2c1e82b 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Push corners in new ESI parser"
+varnishtest "Push corners in new ESI parser"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index b654cf1..5b40c16 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI:remove"
+varnishtest "ESI:remove"
server s1 {
diff --git a/bin/varnishtest/tests/e00021.vtc b/bin/varnishtest/tests/e00021.vtc
index 5c9d848..03fb530 100644
--- a/bin/varnishtest/tests/e00021.vtc
+++ b/bin/varnishtest/tests/e00021.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI ability to stitch gzip files together"
+varnishtest "ESI ability to stitch gzip files together"
server s1 {
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index fb11da3..e402c5e 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI ability to stitch gzip files together"
+varnishtest "ESI ability to stitch gzip files together"
server s1 {
diff --git a/bin/varnishtest/tests/e00023.vtc b/bin/varnishtest/tests/e00023.vtc
index 0bb17f8..1373fc8 100644
--- a/bin/varnishtest/tests/e00023.vtc
+++ b/bin/varnishtest/tests/e00023.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Include gzip'ed and ungzip'ed (ESI) objects in a gzip'ed ESI object"
+varnishtest "Include gzip'ed and ungzip'ed (ESI) objects in a gzip'ed ESI object"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00024.vtc b/bin/varnishtest/tests/e00024.vtc
index e884ef3..2aa8e3a 100644
--- a/bin/varnishtest/tests/e00024.vtc
+++ b/bin/varnishtest/tests/e00024.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test all 8 gzip stopbit residuals"
+varnishtest "Test all 8 gzip stopbit residuals"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00025.vtc b/bin/varnishtest/tests/e00025.vtc
index 6d2e90c..5549f5c 100644
--- a/bin/varnishtest/tests/e00025.vtc
+++ b/bin/varnishtest/tests/e00025.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that esi+gzip correctly bypasses Vary: accept-encoding"
+varnishtest "Test that esi+gzip correctly bypasses Vary: accept-encoding"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00026.vtc b/bin/varnishtest/tests/e00026.vtc
index dd58f78..bcb05b0 100644
--- a/bin/varnishtest/tests/e00026.vtc
+++ b/bin/varnishtest/tests/e00026.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test esi-include + gzip edgecase with respect to gzip hdr"
+varnishtest "Test esi-include + gzip edgecase with respect to gzip hdr"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/e00027.vtc b/bin/varnishtest/tests/e00027.vtc
index 041c0ee..2ee4339 100644
--- a/bin/varnishtest/tests/e00027.vtc
+++ b/bin/varnishtest/tests/e00027.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test HEAD against ESI processing"
+varnishtest "test HEAD against ESI processing"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/g00000.vtc b/bin/varnishtest/tests/g00000.vtc
index 2be241f..b3631b0 100644
--- a/bin/varnishtest/tests/g00000.vtc
+++ b/bin/varnishtest/tests/g00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test req.can_gzip VCL variable"
+varnishtest "test req.can_gzip VCL variable"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/g00001.vtc b/bin/varnishtest/tests/g00001.vtc
index 5da9e32..34ad00f 100644
--- a/bin/varnishtest/tests/g00001.vtc
+++ b/bin/varnishtest/tests/g00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test basic gunzip for client"
+varnishtest "test basic gunzip for client"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/g00002.vtc b/bin/varnishtest/tests/g00002.vtc
index b12e8db..4d713c7 100644
--- a/bin/varnishtest/tests/g00002.vtc
+++ b/bin/varnishtest/tests/g00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test basic gunzip for client"
+varnishtest "test basic gunzip for client"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/g00003.vtc b/bin/varnishtest/tests/g00003.vtc
index a75fbde..dcd8936 100644
--- a/bin/varnishtest/tests/g00003.vtc
+++ b/bin/varnishtest/tests/g00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test gunzip on fetch"
+varnishtest "test gunzip on fetch"
server s1 {
rxreq
@@ -51,4 +49,3 @@ client c1 {
expect resp.http.content-encoding == "resp.http.content-encoding"
expect resp.bodylen == 43
} -run
-
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index c73a52e..217668f 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test std vmod"
+varnishtest "Test std vmod"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/m00001.vtc b/bin/varnishtest/tests/m00001.vtc
index e8b11cf..b7ca47f 100644
--- a/bin/varnishtest/tests/m00001.vtc
+++ b/bin/varnishtest/tests/m00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test std vmod"
+varnishtest "Test std vmod"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc
index a6193ad..aadbbd0 100644
--- a/bin/varnishtest/tests/m00002.vtc
+++ b/bin/varnishtest/tests/m00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test std.random"
+varnishtest "Test std.random"
# needs random generator
random
@@ -34,5 +32,3 @@ client c1 {
expect resp.http.rnd4 == 99.502
expect resp.bodylen == 9
} -run
-
-
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index cd92eb3..30a0f3c 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test vmod_dir param"
+varnishtest "Test vmod_dir param"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/m00004.vtc b/bin/varnishtest/tests/m00004.vtc
index 2561b45..e88dac2 100644
--- a/bin/varnishtest/tests/m00004.vtc
+++ b/bin/varnishtest/tests/m00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test fileread for std VMOD"
+varnishtest "Test fileread for std VMOD"
shell {
printf "File One" > "${tmpdir}/m00004_file_one"
diff --git a/bin/varnishtest/tests/m00005.vtc b/bin/varnishtest/tests/m00005.vtc
index 80dfb74..ec04a3f 100644
--- a/bin/varnishtest/tests/m00005.vtc
+++ b/bin/varnishtest/tests/m00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test vmod_std.duration conversion"
+varnishtest "test vmod_std.duration conversion"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index cdec1f9..9da650c 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test vmod_std.collect()"
+varnishtest "test vmod_std.collect()"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/p00000.vtc b/bin/varnishtest/tests/p00000.vtc
index 6cea757..0a17be2 100644
--- a/bin/varnishtest/tests/p00000.vtc
+++ b/bin/varnishtest/tests/p00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test Basic persistence"
+varnishtest "Test Basic persistence"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/p00001.vtc b/bin/varnishtest/tests/p00001.vtc
index a6e0272..4afccf3 100644
--- a/bin/varnishtest/tests/p00001.vtc
+++ b/bin/varnishtest/tests/p00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Change TTL on persistent object"
+varnishtest "Change TTL on persistent object"
shell "rm -f ${tmpdir}/_.per"
diff --git a/bin/varnishtest/tests/p00002.vtc b/bin/varnishtest/tests/p00002.vtc
index bab409e..cef8f36 100644
--- a/bin/varnishtest/tests/p00002.vtc
+++ b/bin/varnishtest/tests/p00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ban a persistent object"
+varnishtest "Ban a persistent object"
shell "rm -f ${tmpdir}/_.per[12]"
diff --git a/bin/varnishtest/tests/p00003.vtc b/bin/varnishtest/tests/p00003.vtc
index 60f08fd..f554536 100644
--- a/bin/varnishtest/tests/p00003.vtc
+++ b/bin/varnishtest/tests/p00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ban a persistent object"
+varnishtest "Ban a persistent object"
shell "rm -f ${tmpdir}/_.per"
@@ -55,4 +53,3 @@ client c1 {
varnish v1 -cliok ban.list
varnish v1 -stop
-
diff --git a/bin/varnishtest/tests/p00004.vtc b/bin/varnishtest/tests/p00004.vtc
index 24dab08..e9b08f5 100644
--- a/bin/varnishtest/tests/p00004.vtc
+++ b/bin/varnishtest/tests/p00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check object references"
+varnishtest "Check object references"
shell "rm -f ${tmpdir}/_.per"
diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index 7dcb3e5..b41ded3 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check expiry of non-instantiated object"
+varnishtest "Check expiry of non-instantiated object"
shell "rm -f ${tmpdir}/_.per"
diff --git a/bin/varnishtest/tests/p00006.vtc b/bin/varnishtest/tests/p00006.vtc
index 9b7f48a..d30c6cb 100644
--- a/bin/varnishtest/tests/p00006.vtc
+++ b/bin/varnishtest/tests/p00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that Vary headers are stored"
+varnishtest "Check that Vary headers are stored"
shell "rm -f ${tmpdir}/_.per"
@@ -54,4 +52,3 @@ client c1 {
expect resp.http.foo == "foo2"
} -run
-
diff --git a/bin/varnishtest/tests/p00007.vtc b/bin/varnishtest/tests/p00007.vtc
index 8d0a18c..78aa8fb 100644
--- a/bin/varnishtest/tests/p00007.vtc
+++ b/bin/varnishtest/tests/p00007.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "test reload of object spanning incomplete segment"
+varnishtest "test reload of object spanning incomplete segment"
server s1 {
rxreq
@@ -69,4 +67,3 @@ client c1 {
rxresp
expect resp.bodylen == 48
} -run
-
diff --git a/bin/varnishtest/tests/r00102.vtc b/bin/varnishtest/tests/r00102.vtc
index b2f14a0..6cf81cf 100644
--- a/bin/varnishtest/tests/r00102.vtc
+++ b/bin/varnishtest/tests/r00102.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test VCL regsub()"
+varnishtest "Test VCL regsub()"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00251.vtc b/bin/varnishtest/tests/r00251.vtc
index 6f20161..e93eb00 100644
--- a/bin/varnishtest/tests/r00251.vtc
+++ b/bin/varnishtest/tests/r00251.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for #251: segfault on regsub on missing http header"
+varnishtest "Regression test for #251: segfault on regsub on missing http header"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00255.vtc b/bin/varnishtest/tests/r00255.vtc
index e223e74..3a897d7 100644
--- a/bin/varnishtest/tests/r00255.vtc
+++ b/bin/varnishtest/tests/r00255.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for #255: Segfault on header token separation"
+varnishtest "Regression test for #255: Segfault on header token separation"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00262.vtc b/bin/varnishtest/tests/r00262.vtc
index c5ebb24..1ef7255 100644
--- a/bin/varnishtest/tests/r00262.vtc
+++ b/bin/varnishtest/tests/r00262.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that inter-request whitespace trimming works"
+varnishtest "Test that inter-request whitespace trimming works"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00263.vtc b/bin/varnishtest/tests/r00263.vtc
index 109917c..d97ec70 100644
--- a/bin/varnishtest/tests/r00263.vtc
+++ b/bin/varnishtest/tests/r00263.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test refcounting backends from director"
+varnishtest "Test refcounting backends from director"
varnish v1 -vcl+backend {
backend node1 { .host = "10.0.0.1"; .port = "80"; }
diff --git a/bin/varnishtest/tests/r00292.vtc b/bin/varnishtest/tests/r00292.vtc
index 1df83d0..aaa914c 100644
--- a/bin/varnishtest/tests/r00292.vtc
+++ b/bin/varnishtest/tests/r00292.vtc
@@ -1,10 +1,8 @@
-# $Id$
-#
+varnishtest "Header deletion test"
+
# This test checks that the ->hdf flag which tracks Connection: header
# deletes tracks the headers properly.
-test "Header deletion test"
-
server s1 {
rxreq
expect req.url == "/foo"
@@ -36,4 +34,3 @@ client c1 {
-hdr "hdr6: 6"
rxresp
} -run
-
diff --git a/bin/varnishtest/tests/r00306.vtc b/bin/varnishtest/tests/r00306.vtc
index 01b15aa..ebc1774 100644
--- a/bin/varnishtest/tests/r00306.vtc
+++ b/bin/varnishtest/tests/r00306.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for ticket #306, random director ignoring good backend"
+varnishtest "Regression test for ticket #306, random director ignoring good backend"
server s1 {
diff --git a/bin/varnishtest/tests/r00310.vtc b/bin/varnishtest/tests/r00310.vtc
index 88a41f1..5a7d98a 100644
--- a/bin/varnishtest/tests/r00310.vtc
+++ b/bin/varnishtest/tests/r00310.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test obj.http.x-cache in vcl_hit"
+varnishtest "Test obj.http.x-cache in vcl_hit"
varnish v1 -badvcl {
backend foo { .host = "localhost"; }
@@ -9,5 +7,3 @@ varnish v1 -badvcl {
set obj.http.x-cache = "hit";
}
}
-
-
diff --git a/bin/varnishtest/tests/r00318.vtc b/bin/varnishtest/tests/r00318.vtc
index 9cab6af..0170c3d 100644
--- a/bin/varnishtest/tests/r00318.vtc
+++ b/bin/varnishtest/tests/r00318.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "ESI with no body in response"
+varnishtest "ESI with no body in response"
server s1 {
rxreq
@@ -19,4 +17,3 @@ client c1 {
rxresp
expect resp.status == 302
} -run
-
diff --git a/bin/varnishtest/tests/r00325.vtc b/bin/varnishtest/tests/r00325.vtc
index e3eabce..fabc001 100644
--- a/bin/varnishtest/tests/r00325.vtc
+++ b/bin/varnishtest/tests/r00325.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check lack of response-string"
+varnishtest "Check lack of response-string"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00326.vtc b/bin/varnishtest/tests/r00326.vtc
index f61128b..0a7aa04 100644
--- a/bin/varnishtest/tests/r00326.vtc
+++ b/bin/varnishtest/tests/r00326.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "No zerolength verbatim before <esi:include...>"
+varnishtest "No zerolength verbatim before <esi:include...>"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00345.vtc b/bin/varnishtest/tests/r00345.vtc
index da49e4e..712aa98 100644
--- a/bin/varnishtest/tests/r00345.vtc
+++ b/bin/varnishtest/tests/r00345.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "#345, ESI waitinglist trouble"
+varnishtest "#345, ESI waitinglist trouble"
server s1 {
rxreq
@@ -37,4 +35,3 @@ client c1 {
rxresp
expect resp.bodylen == 4
} -run
-
diff --git a/bin/varnishtest/tests/r00365.vtc b/bin/varnishtest/tests/r00365.vtc
index 33ad869..dc1d590 100644
--- a/bin/varnishtest/tests/r00365.vtc
+++ b/bin/varnishtest/tests/r00365.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test restarts in vcl_hit"
+varnishtest "Test restarts in vcl_hit"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00386.vtc b/bin/varnishtest/tests/r00386.vtc
index 3216e99..f5f1907 100644
--- a/bin/varnishtest/tests/r00386.vtc
+++ b/bin/varnishtest/tests/r00386.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "#386, failure to insert include"
+varnishtest "#386, failure to insert include"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00387.vtc b/bin/varnishtest/tests/r00387.vtc
index 707446c..fb73e6b 100644
--- a/bin/varnishtest/tests/r00387.vtc
+++ b/bin/varnishtest/tests/r00387.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for #387: too long chunk header"
+varnishtest "Regression test for #387: too long chunk header"
server s1 {
rxreq
@@ -20,4 +18,3 @@ client c1 {
rxresp
expect resp.status == 503
} -run
-
diff --git a/bin/varnishtest/tests/r00400.vtc b/bin/varnishtest/tests/r00400.vtc
index 9ba702f..c732e50 100644
--- a/bin/varnishtest/tests/r00400.vtc
+++ b/bin/varnishtest/tests/r00400.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for ticket 409"
+varnishtest "Regression test for ticket 409"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00409.vtc b/bin/varnishtest/tests/r00409.vtc
index 0b0ae08..4857fff 100644
--- a/bin/varnishtest/tests/r00409.vtc
+++ b/bin/varnishtest/tests/r00409.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for ticket 409"
+varnishtest "Regression test for ticket 409"
varnish v1 -badvcl {
sub vcl_recv {
diff --git a/bin/varnishtest/tests/r00411.vtc b/bin/varnishtest/tests/r00411.vtc
index a61e5a9..5677fc3 100644
--- a/bin/varnishtest/tests/r00411.vtc
+++ b/bin/varnishtest/tests/r00411.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test restart in vcl_deliver"
+varnishtest "Test restart in vcl_deliver"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00412.vtc b/bin/varnishtest/tests/r00412.vtc
index 4e04a0b..8e28262 100644
--- a/bin/varnishtest/tests/r00412.vtc
+++ b/bin/varnishtest/tests/r00412.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for ticket 412"
+varnishtest "Regression test for ticket 412"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00416.vtc b/bin/varnishtest/tests/r00416.vtc
index 05f9bd6..3d0ed71 100644
--- a/bin/varnishtest/tests/r00416.vtc
+++ b/bin/varnishtest/tests/r00416.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for #416: a surplus of HTTP headers"
+varnishtest "Regression test for #416: a surplus of HTTP headers"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00425.vtc b/bin/varnishtest/tests/r00425.vtc
index 0a31b63..1c2c19f 100644
--- a/bin/varnishtest/tests/r00425.vtc
+++ b/bin/varnishtest/tests/r00425.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "check late pass stalling"
+varnishtest "check late pass stalling"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00427.vtc b/bin/varnishtest/tests/r00427.vtc
index 0d1341a..963b7fe 100644
--- a/bin/varnishtest/tests/r00427.vtc
+++ b/bin/varnishtest/tests/r00427.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "client close in ESI delivery"
+varnishtest "client close in ESI delivery"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00433.vtc b/bin/varnishtest/tests/r00433.vtc
index 5714ea7..f782f14 100644
--- a/bin/varnishtest/tests/r00433.vtc
+++ b/bin/varnishtest/tests/r00433.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "noidx"
+varnishtest "noidx"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00444.vtc b/bin/varnishtest/tests/r00444.vtc
index c6f3b3b..f71f905 100644
--- a/bin/varnishtest/tests/r00444.vtc
+++ b/bin/varnishtest/tests/r00444.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "purging on POST"
+varnishtest "purging on POST"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc
index 9085c36..9d29258 100644
--- a/bin/varnishtest/tests/r00445.vtc
+++ b/bin/varnishtest/tests/r00445.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "zero length ESI include segmens with chunked encoding"
+varnishtest "zero length ESI include segmens with chunked encoding"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00466.vtc b/bin/varnishtest/tests/r00466.vtc
index 6a40a56..acff68a 100644
--- a/bin/varnishtest/tests/r00466.vtc
+++ b/bin/varnishtest/tests/r00466.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check Range forwarding to backend"
+varnishtest "Check Range forwarding to backend"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00476.vtc b/bin/varnishtest/tests/r00476.vtc
index c6cc3f1..abf15e6 100644
--- a/bin/varnishtest/tests/r00476.vtc
+++ b/bin/varnishtest/tests/r00476.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "zero length ESI include segments with chunked encoding"
+varnishtest "zero length ESI include segments with chunked encoding"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00494.vtc b/bin/varnishtest/tests/r00494.vtc
index 328d202..d1dedd1 100644
--- a/bin/varnishtest/tests/r00494.vtc
+++ b/bin/varnishtest/tests/r00494.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "HTTP continuation lines"
+varnishtest "HTTP continuation lines"
#NB: careful about spaces and tabs in this test.
@@ -24,4 +22,3 @@ client c1 {
expect resp.http.barf == resp.http.barf
expect resp.http.foo == resp.http.foo
} -run
-
diff --git a/bin/varnishtest/tests/r00495.vtc b/bin/varnishtest/tests/r00495.vtc
index 59d6de1..76ed867 100644
--- a/bin/varnishtest/tests/r00495.vtc
+++ b/bin/varnishtest/tests/r00495.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "HTTP 1.0 backend not getting reused"
+varnishtest "HTTP 1.0 backend not getting reused"
server s1 {
diff --git a/bin/varnishtest/tests/r00498.vtc b/bin/varnishtest/tests/r00498.vtc
index 6e4e915..efdb93a 100644
--- a/bin/varnishtest/tests/r00498.vtc
+++ b/bin/varnishtest/tests/r00498.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "very very very long return header"
+varnishtest "very very very long return header"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00502.vtc b/bin/varnishtest/tests/r00502.vtc
index b5d44aa..4b9d639 100644
--- a/bin/varnishtest/tests/r00502.vtc
+++ b/bin/varnishtest/tests/r00502.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "multi element ban"
+varnishtest "multi element ban"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00506.vtc b/bin/varnishtest/tests/r00506.vtc
index 8079c5d..49722ef 100644
--- a/bin/varnishtest/tests/r00506.vtc
+++ b/bin/varnishtest/tests/r00506.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Illegal HTTP status from backend"
+varnishtest "Illegal HTTP status from backend"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00524.vtc b/bin/varnishtest/tests/r00524.vtc
index 4b3c2a4..157eebe 100644
--- a/bin/varnishtest/tests/r00524.vtc
+++ b/bin/varnishtest/tests/r00524.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for 524: HTTP/1.0 and ESI"
+varnishtest "Regression test for 524: HTTP/1.0 and ESI"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00549.vtc b/bin/varnishtest/tests/r00549.vtc
index e071c89..89894b0 100644
--- a/bin/varnishtest/tests/r00549.vtc
+++ b/bin/varnishtest/tests/r00549.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-# Regression test for bad backend reply with ctrl char.
+varnishtest "Regression test for bad backend reply with ctrl char."
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00558.vtc b/bin/varnishtest/tests/r00558.vtc
index c37214d..0efb9e9 100644
--- a/bin/varnishtest/tests/r00558.vtc
+++ b/bin/varnishtest/tests/r00558.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "error from vcl_recv{} has no numeric code"
+varnishtest "error from vcl_recv{} has no numeric code"
server s1 {
diff --git a/bin/varnishtest/tests/r00561.vtc b/bin/varnishtest/tests/r00561.vtc
index 0c91b51..0a273b0 100644
--- a/bin/varnishtest/tests/r00561.vtc
+++ b/bin/varnishtest/tests/r00561.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Junk request should not go to vcl_error"
+varnishtest "Junk request should not go to vcl_error"
server s1 {
rxreq
@@ -22,4 +20,3 @@ client c1 {
txreq
rxresp
} -run
-
diff --git a/bin/varnishtest/tests/r00590.vtc b/bin/varnishtest/tests/r00590.vtc
index ef954f9..d865fe9 100644
--- a/bin/varnishtest/tests/r00590.vtc
+++ b/bin/varnishtest/tests/r00590.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for 590"
+varnishtest "Regression test for 590"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00612.vtc b/bin/varnishtest/tests/r00612.vtc
index dc2c3fa..defaeca 100644
--- a/bin/varnishtest/tests/r00612.vtc
+++ b/bin/varnishtest/tests/r00612.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Url workspace gets overwritten/reused"
+varnishtest "Url workspace gets overwritten/reused"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00641.vtc b/bin/varnishtest/tests/r00641.vtc
index be9d0c5..ef825d7 100644
--- a/bin/varnishtest/tests/r00641.vtc
+++ b/bin/varnishtest/tests/r00641.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for 524: HTTP/1.0 and ESI"
+varnishtest "Regression test for 524: HTTP/1.0 and ESI"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00655.vtc b/bin/varnishtest/tests/r00655.vtc
index f6b7f67..c788219 100644
--- a/bin/varnishtest/tests/r00655.vtc
+++ b/bin/varnishtest/tests/r00655.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test nested /*...*/ comments "
+varnishtest "Test nested /*...*/ comments "
varnish v1 -badvcl {
diff --git a/bin/varnishtest/tests/r00667.vtc b/bin/varnishtest/tests/r00667.vtc
index 19d5cb9..1555df1 100644
--- a/bin/varnishtest/tests/r00667.vtc
+++ b/bin/varnishtest/tests/r00667.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "things stuck on busy object"
+varnishtest "things stuck on busy object"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00679.vtc b/bin/varnishtest/tests/r00679.vtc
index 825df8b..a79b4c9 100644
--- a/bin/varnishtest/tests/r00679.vtc
+++ b/bin/varnishtest/tests/r00679.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "pass + HEAD"
+varnishtest "pass + HEAD"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00686.vtc b/bin/varnishtest/tests/r00686.vtc
index 9e3e4b3..2163ce4 100644
--- a/bin/varnishtest/tests/r00686.vtc
+++ b/bin/varnishtest/tests/r00686.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that cache-control headers are collapsed"
+varnishtest "Check that cache-control headers are collapsed"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00693.vtc b/bin/varnishtest/tests/r00693.vtc
index cc916da..6cf7b30 100644
--- a/bin/varnishtest/tests/r00693.vtc
+++ b/bin/varnishtest/tests/r00693.vtc
@@ -1,7 +1,4 @@
-# $Id$
-#
-
-test "check boundary condition on vrt_assemble_string()"
+varnishtest "check boundary condition on vrt_assemble_string()"
feature 64bit
diff --git a/bin/varnishtest/tests/r00694.vtc b/bin/varnishtest/tests/r00694.vtc
index 372b823..da2d9a5 100644
--- a/bin/varnishtest/tests/r00694.vtc
+++ b/bin/varnishtest/tests/r00694.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Wrong calculation of last storage segment length"
+varnishtest "Wrong calculation of last storage segment length"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00700.vtc b/bin/varnishtest/tests/r00700.vtc
index eebc7a1..a831430 100644
--- a/bin/varnishtest/tests/r00700.vtc
+++ b/bin/varnishtest/tests/r00700.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "check TAB in 3 header field"
+varnishtest "check TAB in 3 header field"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00702.vtc b/bin/varnishtest/tests/r00702.vtc
index 15ac4fa..a96624e 100644
--- a/bin/varnishtest/tests/r00702.vtc
+++ b/bin/varnishtest/tests/r00702.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Range bug"
+varnishtest "Range bug"
server s1 {
rxreq
@@ -19,4 +17,3 @@ client c1 {
expect resp.status == 206
expect resp.bodylen == 50
} -run
-
diff --git a/bin/varnishtest/tests/r00704.vtc b/bin/varnishtest/tests/r00704.vtc
index 4f3992a..5ee5702 100644
--- a/bin/varnishtest/tests/r00704.vtc
+++ b/bin/varnishtest/tests/r00704.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Range bug"
+varnishtest "Range bug"
server s1 {
rxreq
@@ -19,4 +17,3 @@ client c1 {
expect resp.status == 206
expect resp.bodylen == 20
} -run
-
diff --git a/bin/varnishtest/tests/r00722.vtc b/bin/varnishtest/tests/r00722.vtc
index 4756b0c..8d7dc24 100644
--- a/bin/varnishtest/tests/r00722.vtc
+++ b/bin/varnishtest/tests/r00722.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Director cleanup fails on vcl.discard"
+varnishtest "Director cleanup fails on vcl.discard"
server s1 {
rxreq
@@ -28,4 +26,3 @@ client c1 {
txreq
rxresp
} -run
-
diff --git a/bin/varnishtest/tests/r00730.vtc b/bin/varnishtest/tests/r00730.vtc
index c61e57f..6ed2847 100644
--- a/bin/varnishtest/tests/r00730.vtc
+++ b/bin/varnishtest/tests/r00730.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that HEAD returns Content-Length: if backend provides"
+varnishtest "Check that HEAD returns Content-Length: if backend provides"
server s1 {
rxreq
@@ -30,4 +28,3 @@ client c1 {
rxresp -no_obj
expect resp.http.content-length == 6
} -run
-
diff --git a/bin/varnishtest/tests/r00733.vtc b/bin/varnishtest/tests/r00733.vtc
index 701a72b..4d6dd05 100644
--- a/bin/varnishtest/tests/r00733.vtc
+++ b/bin/varnishtest/tests/r00733.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "HTTP/1.1 Backend sends no length hint"
+varnishtest "HTTP/1.1 Backend sends no length hint"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00742.vtc b/bin/varnishtest/tests/r00742.vtc
index 851dfa2..9005fec 100644
--- a/bin/varnishtest/tests/r00742.vtc
+++ b/bin/varnishtest/tests/r00742.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "% escapes in VCL source and vcl.show"
+varnishtest "% escapes in VCL source and vcl.show"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00763.vtc b/bin/varnishtest/tests/r00763.vtc
index 644b953..24a4d6f 100644
--- a/bin/varnishtest/tests/r00763.vtc
+++ b/bin/varnishtest/tests/r00763.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Vary header with extra colon"
+varnishtest "Vary header with extra colon"
server s1 {
rxreq
@@ -14,5 +12,3 @@ client c1 {
rxresp
expect resp.http.vary == ": foo"
} -run
-
-
diff --git a/bin/varnishtest/tests/r00769.vtc b/bin/varnishtest/tests/r00769.vtc
index 0216d04..b464914 100644
--- a/bin/varnishtest/tests/r00769.vtc
+++ b/bin/varnishtest/tests/r00769.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that set status code is readable again for obj.status and beresp.status"
+varnishtest "Test that set status code is readable again for obj.status and beresp.status"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00776.vtc b/bin/varnishtest/tests/r00776.vtc
index 897f9e7..776810e 100644
--- a/bin/varnishtest/tests/r00776.vtc
+++ b/bin/varnishtest/tests/r00776.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Edge case of chunked encoding, trimming storage to length."
+varnishtest "Edge case of chunked encoding, trimming storage to length."
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00781.vtc b/bin/varnishtest/tests/r00781.vtc
index e0d0af9..94d0132 100644
--- a/bin/varnishtest/tests/r00781.vtc
+++ b/bin/varnishtest/tests/r00781.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "NULL assignment to line1 fields."
+varnishtest "NULL assignment to line1 fields."
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00789.vtc b/bin/varnishtest/tests/r00789.vtc
index 60a5e6e..c323af4 100644
--- a/bin/varnishtest/tests/r00789.vtc
+++ b/bin/varnishtest/tests/r00789.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "pass should not filter Content-Range header"
+varnishtest "pass should not filter Content-Range header"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00795.vtc b/bin/varnishtest/tests/r00795.vtc
index c4709d0..2d832aa 100644
--- a/bin/varnishtest/tests/r00795.vtc
+++ b/bin/varnishtest/tests/r00795.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Content-Length in pass'ed 304 does not trigger body fetch"
+varnishtest "Content-Length in pass'ed 304 does not trigger body fetch"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00801.vtc b/bin/varnishtest/tests/r00801.vtc
index a5faa9a..f6fe5bd 100644
--- a/bin/varnishtest/tests/r00801.vtc
+++ b/bin/varnishtest/tests/r00801.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for duplicate content-length in pass"
+varnishtest "Regression test for duplicate content-length in pass"
server s1 {
rxreq
@@ -20,5 +18,3 @@ client c1 {
rxresp
expect resp.http.content-length == "10"
} -run
-
-
diff --git a/bin/varnishtest/tests/r00803.vtc b/bin/varnishtest/tests/r00803.vtc
index cdac1cb..7e47503 100644
--- a/bin/varnishtest/tests/r00803.vtc
+++ b/bin/varnishtest/tests/r00803.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "304 response in pass mode"
+varnishtest "304 response in pass mode"
server s1 {
rxreq
@@ -20,5 +18,3 @@ client c1 {
rxresp
expect resp.status == 304
} -run
-
-
diff --git a/bin/varnishtest/tests/r00806.vtc b/bin/varnishtest/tests/r00806.vtc
index 92b5e2a..7e8fdbc 100644
--- a/bin/varnishtest/tests/r00806.vtc
+++ b/bin/varnishtest/tests/r00806.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Content-Length in pass'ed 304 does not trigger body fetch"
+varnishtest "Content-Length in pass'ed 304 does not trigger body fetch"
server s1 {
rxreq
@@ -26,5 +24,3 @@ client c1 {
expect resp.status == 304
expect resp.http.cl == 100
} -run
-
-
diff --git a/bin/varnishtest/tests/r00832.vtc b/bin/varnishtest/tests/r00832.vtc
index a1df55a..f334fab 100644
--- a/bin/varnishtest/tests/r00832.vtc
+++ b/bin/varnishtest/tests/r00832.vtc
@@ -1,6 +1,4 @@
-# $Id
-
-test "Regression #832 IPV6 parse bug"
+varnishtest "Regression #832 IPV6 parse bug"
varnish v1 -vcl {
backend default {
diff --git a/bin/varnishtest/tests/r00861.vtc b/bin/varnishtest/tests/r00861.vtc
index 6842cbd..165795b 100644
--- a/bin/varnishtest/tests/r00861.vtc
+++ b/bin/varnishtest/tests/r00861.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Regression test for ESI/Gzip issues in #861"
+varnishtest "Regression test for ESI/Gzip issues in #861"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00873.vtc b/bin/varnishtest/tests/r00873.vtc
index 6797559..56afc19 100644
--- a/bin/varnishtest/tests/r00873.vtc
+++ b/bin/varnishtest/tests/r00873.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ticket #873"
+varnishtest "Ticket #873"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00878.vtc b/bin/varnishtest/tests/r00878.vtc
index c57e511..6997189 100644
--- a/bin/varnishtest/tests/r00878.vtc
+++ b/bin/varnishtest/tests/r00878.vtc
@@ -1,6 +1,4 @@
-#!/bin/sh
-
-test "Loading vmods in subsequent VCLs"
+varnishtest "Loading vmods in subsequent VCLs"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00887.vtc b/bin/varnishtest/tests/r00887.vtc
index 697be6e..fb9843c 100644
--- a/bin/varnishtest/tests/r00887.vtc
+++ b/bin/varnishtest/tests/r00887.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ticket #887"
+varnishtest "Ticket #887"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index c22037f..d3b9856 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ticket #894"
+varnishtest "Ticket #894"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00896.vtc b/bin/varnishtest/tests/r00896.vtc
index 6eb4287..280a176 100644
--- a/bin/varnishtest/tests/r00896.vtc
+++ b/bin/varnishtest/tests/r00896.vtc
@@ -1,4 +1,4 @@
-test "Ticket #896, strings over 256 bytes"
+varnishtest "Ticket #896, strings over 256 bytes"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/r00902.vtc b/bin/varnishtest/tests/r00902.vtc
index e082529..67e4c96 100644
--- a/bin/varnishtest/tests/r00902.vtc
+++ b/bin/varnishtest/tests/r00902.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ticket #902 http_CollectHdr() failure on consequitive headers"
+varnishtest "Ticket #902 http_CollectHdr() failure on consequitive headers"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/s00000.vtc b/bin/varnishtest/tests/s00000.vtc
index a0184ce..717dd02 100644
--- a/bin/varnishtest/tests/s00000.vtc
+++ b/bin/varnishtest/tests/s00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Simple expiry test"
+varnishtest "Simple expiry test"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/s00001.vtc b/bin/varnishtest/tests/s00001.vtc
index f907723..1dd34bc 100644
--- a/bin/varnishtest/tests/s00001.vtc
+++ b/bin/varnishtest/tests/s00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Simple expiry test (fully reaped object)"
+varnishtest "Simple expiry test (fully reaped object)"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/s00002.vtc b/bin/varnishtest/tests/s00002.vtc
index b0bc60a..f7b8820 100644
--- a/bin/varnishtest/tests/s00002.vtc
+++ b/bin/varnishtest/tests/s00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check grace with sick backends"
+varnishtest "Check grace with sick backends"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/s00003.vtc b/bin/varnishtest/tests/s00003.vtc
index 4277a97..b7476d7 100644
--- a/bin/varnishtest/tests/s00003.vtc
+++ b/bin/varnishtest/tests/s00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check saint mode with sick pages"
+varnishtest "Check saint mode with sick pages"
server s1 {
timeout 10
diff --git a/bin/varnishtest/tests/t00000.vtc b/bin/varnishtest/tests/t00000.vtc
index 7116b42..57ab7c7 100644
--- a/bin/varnishtest/tests/t00000.vtc
+++ b/bin/varnishtest/tests/t00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Ticket #873"
+varnishtest "Ticket #873"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00000.vtc b/bin/varnishtest/tests/v00000.vtc
index ac565cb..697dc53 100644
--- a/bin/varnishtest/tests/v00000.vtc
+++ b/bin/varnishtest/tests/v00000.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL/VRT: req.grace, obj.ttl and obj.grace"
+varnishtest "VCL/VRT: req.grace, obj.ttl and obj.grace"
server s1 {
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index ce7d609..644e737 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/bin/varnishtest/tests/v00001.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL/VRT: url/request/proto/response/status"
+varnishtest "VCL/VRT: url/request/proto/response/status"
server s1 {
diff --git a/bin/varnishtest/tests/v00002.vtc b/bin/varnishtest/tests/v00002.vtc
index d7852e8..586cfac 100644
--- a/bin/varnishtest/tests/v00002.vtc
+++ b/bin/varnishtest/tests/v00002.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: test syntax/semantic checks on backend decls. (vcc_backend.c)"
+varnishtest "VCL: test syntax/semantic checks on backend decls. (vcc_backend.c)"
# Missing backend
varnish v1 -badvcl {
@@ -192,4 +190,3 @@ varnish v1 -badvcl {
.probe = { .expected_response = 13; }
}
}
-
diff --git a/bin/varnishtest/tests/v00003.vtc b/bin/varnishtest/tests/v00003.vtc
index 0104584..ec4248d 100644
--- a/bin/varnishtest/tests/v00003.vtc
+++ b/bin/varnishtest/tests/v00003.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: test syntax/semantic checks on director decls."
+varnishtest "VCL: test syntax/semantic checks on director decls."
# syntax in inline backend
varnish v1 -badvcl {
diff --git a/bin/varnishtest/tests/v00004.vtc b/bin/varnishtest/tests/v00004.vtc
index c2318fd..b5419a1 100644
--- a/bin/varnishtest/tests/v00004.vtc
+++ b/bin/varnishtest/tests/v00004.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: test creation/destruction of backends"
+varnishtest "VCL: test creation/destruction of backends"
varnish v1 -vcl {
backend b1 {
diff --git a/bin/varnishtest/tests/v00005.vtc b/bin/varnishtest/tests/v00005.vtc
index da673ed..a84d3be 100644
--- a/bin/varnishtest/tests/v00005.vtc
+++ b/bin/varnishtest/tests/v00005.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: test backend probe syntax"
+varnishtest "VCL: test backend probe syntax"
# Check status definition
varnish v1 -vcl {
diff --git a/bin/varnishtest/tests/v00006.vtc b/bin/varnishtest/tests/v00006.vtc
index 7f88652..f3faace 100644
--- a/bin/varnishtest/tests/v00006.vtc
+++ b/bin/varnishtest/tests/v00006.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: Test backend retirement"
+varnishtest "VCL: Test backend retirement"
# First do one request to get a work-thread that holds a VCL reference
diff --git a/bin/varnishtest/tests/v00007.vtc b/bin/varnishtest/tests/v00007.vtc
index 2e1a465..5768c02 100644
--- a/bin/varnishtest/tests/v00007.vtc
+++ b/bin/varnishtest/tests/v00007.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test random director"
+varnishtest "Test random director"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00008.vtc b/bin/varnishtest/tests/v00008.vtc
index 82bfe72..9cd01eb 100644
--- a/bin/varnishtest/tests/v00008.vtc
+++ b/bin/varnishtest/tests/v00008.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test host header specification"
+varnishtest "Test host header specification"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00009.vtc b/bin/varnishtest/tests/v00009.vtc
index f61e6a8..04b8ccb 100644
--- a/bin/varnishtest/tests/v00009.vtc
+++ b/bin/varnishtest/tests/v00009.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test round robin director"
+varnishtest "Test round robin director"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 259894f..ec7b947 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL: check panic and restart"
+varnishtest "VCL: check panic and restart"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00011.vtc b/bin/varnishtest/tests/v00011.vtc
index d62cff9..6cce4de 100644
--- a/bin/varnishtest/tests/v00011.vtc
+++ b/bin/varnishtest/tests/v00011.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test vcl purging"
+varnishtest "Test vcl purging"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00012.vtc b/bin/varnishtest/tests/v00012.vtc
index dc7417c..285f2c1 100644
--- a/bin/varnishtest/tests/v00012.vtc
+++ b/bin/varnishtest/tests/v00012.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check backend connection limit"
+varnishtest "Check backend connection limit"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00013.vtc b/bin/varnishtest/tests/v00013.vtc
index 322df74..031e484 100644
--- a/bin/varnishtest/tests/v00013.vtc
+++ b/bin/varnishtest/tests/v00013.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check obj.hits"
+varnishtest "Check obj.hits"
server s1 {
rxreq
@@ -39,4 +37,3 @@ client c1 {
expect resp.status == 200
expect resp.http.foo == 2
} -run
-
diff --git a/bin/varnishtest/tests/v00014.vtc b/bin/varnishtest/tests/v00014.vtc
index eff1f6c..206e8bc 100644
--- a/bin/varnishtest/tests/v00014.vtc
+++ b/bin/varnishtest/tests/v00014.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check req.backend.healthy"
+varnishtest "Check req.backend.healthy"
server s1 {
rxreq
@@ -58,4 +56,3 @@ client c1 {
rxresp
expect resp.status == 200
} -run
-
diff --git a/bin/varnishtest/tests/v00015.vtc b/bin/varnishtest/tests/v00015.vtc
index c60bb45..c5441d0 100644
--- a/bin/varnishtest/tests/v00015.vtc
+++ b/bin/varnishtest/tests/v00015.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check function calls with no action return"
+varnishtest "Check function calls with no action return"
server s1 {
rxreq
@@ -26,4 +24,3 @@ client c1 {
rxresp
expect resp.status == 200
} -run
-
diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 7e80e16..691cc56 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Various VCL compiler coverage tests"
+varnishtest "Various VCL compiler coverage tests"
shell "true > ${tmpdir}/_varnishtest_empty_file"
diff --git a/bin/varnishtest/tests/v00017.vtc b/bin/varnishtest/tests/v00017.vtc
index 1df6225..66d54fb 100644
--- a/bin/varnishtest/tests/v00017.vtc
+++ b/bin/varnishtest/tests/v00017.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL compiler coverage test: vcc_acl.c"
+varnishtest "VCL compiler coverage test: vcc_acl.c"
varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; }
@@ -92,4 +90,3 @@ varnish v1 -vcl {
}
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
}
-
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 13e39e0..2c129d7 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL compiler coverage test: vcc_action.c"
+varnishtest "VCL compiler coverage test: vcc_action.c"
varnish v1 -vcl {
backend b { .host = "127.0.0.1"; }
diff --git a/bin/varnishtest/tests/v00019.vtc b/bin/varnishtest/tests/v00019.vtc
index c09e31a..eabcdd0 100644
--- a/bin/varnishtest/tests/v00019.vtc
+++ b/bin/varnishtest/tests/v00019.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL compiler coverage test: vcc_token.c"
+varnishtest "VCL compiler coverage test: vcc_token.c"
varnish v1 -badvcl " C{ "
diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index abba9b7..1e36b43 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL compiler coverage test: vcc_parse.c & vcc_expr.c"
+varnishtest "VCL compiler coverage test: vcc_parse.c & vcc_expr.c"
varnish v1 -vcl {
backend b { .host = "127.0.0.1"; }
diff --git a/bin/varnishtest/tests/v00021.vtc b/bin/varnishtest/tests/v00021.vtc
index b20432f..70a3266 100644
--- a/bin/varnishtest/tests/v00021.vtc
+++ b/bin/varnishtest/tests/v00021.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "VCL compiler coverage test: vcc_xref.c"
+varnishtest "VCL compiler coverage test: vcc_xref.c"
varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; }
diff --git a/bin/varnishtest/tests/v00022.vtc b/bin/varnishtest/tests/v00022.vtc
index b785646..15b9a90 100644
--- a/bin/varnishtest/tests/v00022.vtc
+++ b/bin/varnishtest/tests/v00022.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Deeper test of random director"
+varnishtest "Deeper test of random director"
random
diff --git a/bin/varnishtest/tests/v00023.vtc b/bin/varnishtest/tests/v00023.vtc
index 6b9bccf..ca36194 100644
--- a/bin/varnishtest/tests/v00023.vtc
+++ b/bin/varnishtest/tests/v00023.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that obj.ttl = 0s prevents subsequent hits"
+varnishtest "Test that obj.ttl = 0s prevents subsequent hits"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00024.vtc b/bin/varnishtest/tests/v00024.vtc
index 4a27cca..9c2040c 100644
--- a/bin/varnishtest/tests/v00024.vtc
+++ b/bin/varnishtest/tests/v00024.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Test that headers can be compared"
+varnishtest "Test that headers can be compared"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index a8c3c3c..aab2c83 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/bin/varnishtest/tests/v00025.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "More VCL coverage"
+varnishtest "More VCL coverage"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00026.vtc b/bin/varnishtest/tests/v00026.vtc
index 0f09160..e7f4fa4 100644
--- a/bin/varnishtest/tests/v00026.vtc
+++ b/bin/varnishtest/tests/v00026.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Hash director"
+varnishtest "Hash director"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00027.vtc b/bin/varnishtest/tests/v00027.vtc
index e9e32c6..42cb312 100644
--- a/bin/varnishtest/tests/v00027.vtc
+++ b/bin/varnishtest/tests/v00027.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Check that backend named 'default' is the default"
+varnishtest "Check that backend named 'default' is the default"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00028.vtc b/bin/varnishtest/tests/v00028.vtc
index 5c64d23..c956517 100644
--- a/bin/varnishtest/tests/v00028.vtc
+++ b/bin/varnishtest/tests/v00028.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Client director"
+varnishtest "Client director"
server s1 {
rxreq
@@ -57,5 +55,3 @@ client c1 {
expect resp.http.be == s2
expect resp.bodylen == 4
} -run
-
-
diff --git a/bin/varnishtest/tests/v00029.vtc b/bin/varnishtest/tests/v00029.vtc
index c1e113c..6da2315 100644
--- a/bin/varnishtest/tests/v00029.vtc
+++ b/bin/varnishtest/tests/v00029.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "DNS director"
+varnishtest "DNS director"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00030.vtc b/bin/varnishtest/tests/v00030.vtc
index 82c3422..a2dff48 100644
--- a/bin/varnishtest/tests/v00030.vtc
+++ b/bin/varnishtest/tests/v00030.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "DNS director bad VCL tests"
+varnishtest "DNS director bad VCL tests"
varnish v1 -badvcl {
director directorname dns {
diff --git a/bin/varnishtest/tests/v00031.vtc b/bin/varnishtest/tests/v00031.vtc
index 5bdfb65..0bae6e0 100644
--- a/bin/varnishtest/tests/v00031.vtc
+++ b/bin/varnishtest/tests/v00031.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "param vcc_err_unref"
+varnishtest "param vcc_err_unref"
varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; }
@@ -20,4 +18,3 @@ varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; }
backend c { .host = "127.0.0.1"; }
}
-
diff --git a/bin/varnishtest/tests/v00032.vtc b/bin/varnishtest/tests/v00032.vtc
index 2999fdc..8bf4c69 100644
--- a/bin/varnishtest/tests/v00032.vtc
+++ b/bin/varnishtest/tests/v00032.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Storage related vcl variables"
+varnishtest "Storage related vcl variables"
server s1 {
rxreq
diff --git a/bin/varnishtest/tests/v00033.vtc b/bin/varnishtest/tests/v00033.vtc
index 6939855..403931d 100644
--- a/bin/varnishtest/tests/v00033.vtc
+++ b/bin/varnishtest/tests/v00033.vtc
@@ -1,6 +1,4 @@
-# $Id$
-
-test "Stevedore variables and BYTES type test"
+varnishtest "Stevedore variables and BYTES type test"
server s1 {
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 0a33ada..e893be1 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -326,7 +323,7 @@ reset_cmds(const struct cmds *cmd)
*/
static void
-cmd_test(CMD_ARGS)
+cmd_varnishtest(CMD_ARGS)
{
(void)priv;
@@ -335,7 +332,7 @@ cmd_test(CMD_ARGS)
if (av == NULL)
return;
- assert(!strcmp(av[0], "test"));
+ assert(!strcmp(av[0], "varnishtest"));
vtc_log(vl, 1, "TEST %s", av[1]);
AZ(av[2]);
@@ -465,7 +462,7 @@ static const struct cmds cmds[] = {
{ "client", cmd_client },
{ "varnish", cmd_varnish },
{ "delay", cmd_delay },
- { "test", cmd_test },
+ { "varnishtest",cmd_varnishtest },
{ "shell", cmd_shell },
{ "sema", cmd_sema },
{ "random", cmd_random },
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 28a5ca3..16e27a9 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <limits.h>
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index b93dcd3..c7a2588 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 3e0fbab..e0d3ef0 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <poll.h>
#include <stdio.h>
#include <poll.h>
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 7e9c84c..3d5a5ac 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index d53e991..3f5d518 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
diff --git a/bin/varnishtest/vtc_sema.c b/bin/varnishtest/vtc_sema.c
index 7f60d2c..92b1a7a 100644
--- a/bin/varnishtest/vtc_sema.c
+++ b/bin/varnishtest/vtc_sema.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 4d60fe2..a7871bd 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 4f9c668..d416a5b 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <fcntl.h>
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index ee2ed32..200ed96 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 3b834a0..4224bf9 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <curses.h>
#include <errno.h>
diff --git a/configure.ac b/configure.ac
index 1f19044..f401b45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-# $Id$
-
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
Copyright (c) 2006-2010 Linpro AS])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 177bdf8..8495bf7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
CHANGELOGS = \
changes-2.1.0.html \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 24faf56..e724822 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
EXTRA_DIST = zope-plone.vcl
DISTCLEANFILES = default.vcl
diff --git a/include/Makefile.am b/include/Makefile.am
index a46ae72..e5b4348 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
pkginclude_HEADERS = \
vsm.h \
@@ -31,7 +31,6 @@ nobase_noinst_HEADERS = \
libvcl.h \
miniobj.h \
persistent.h \
- svnid.h \
vas.h \
vsha256.h \
vqueue.h \
diff --git a/include/argv.h b/include/argv.h
index 2548ec5..d2ece25 100644
--- a/include/argv.h
+++ b/include/argv.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
void FreeArgv(char **argv);
diff --git a/include/ban_vars.h b/include/ban_vars.h
index 2420c39..2ba0930 100644
--- a/include/ban_vars.h
+++ b/include/ban_vars.h
@@ -25,8 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Define which variables we can ban on, and which function does it.
*
*/
diff --git a/include/binary_heap.h b/include/binary_heap.h
index d8a4475..fb27169 100644
--- a/include/binary_heap.h
+++ b/include/binary_heap.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Binary Heap API (see: http://en.wikipedia.org/wiki/Binary_heap)
*
* XXX: doesn't scale back the array of pointers when items are deleted.
diff --git a/include/cli.h b/include/cli.h
index 3734b0b..e5c4f0c 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Public definition of the CLI protocol, part of the published Varnish-API.
*
* The overall structure of the protocol is a command-line like
diff --git a/include/cli_common.h b/include/cli_common.h
index 98904bb..68e7acd 100644
--- a/include/cli_common.h
+++ b/include/cli_common.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct vlu;
diff --git a/include/cli_priv.h b/include/cli_priv.h
index 067c862..9d35181 100644
--- a/include/cli_priv.h
+++ b/include/cli_priv.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Varnish process internal CLI stuff.
*
* XXX: at a latter date we may want to move some to cli.h/libvarnishapi
diff --git a/include/cli_serve.h b/include/cli_serve.h
index 07db8b6..d834b4d 100644
--- a/include/cli_serve.h
+++ b/include/cli_serve.h
@@ -25,8 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
*/
struct cls;
diff --git a/include/compat/daemon.h b/include/compat/daemon.h
index 29fa9cd..54ff8d6 100644
--- a/include/compat/daemon.h
+++ b/include/compat/daemon.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_DAEMON_H_INCLUDED
diff --git a/include/compat/execinfo.h b/include/compat/execinfo.h
index 6dc6e34..7b3b2e3 100644
--- a/include/compat/execinfo.h
+++ b/include/compat/execinfo.h
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: execinfo.h,v 1.2 2004/07/19 05:20:29 sobomax Exp $
*/
#ifndef COMPAT_EXECINFO_H_INCLUDED
diff --git a/include/compat/setproctitle.h b/include/compat/setproctitle.h
index 30eff42..85bb5e8 100644
--- a/include/compat/setproctitle.h
+++ b/include/compat/setproctitle.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_SETPROCTITLE_H_INCLUDED
diff --git a/include/compat/srandomdev.h b/include/compat/srandomdev.h
index cf1c6c7..2433e49 100644
--- a/include/compat/srandomdev.h
+++ b/include/compat/srandomdev.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_SRANDOMDEV_H_INCLUDED
diff --git a/include/compat/strlcat.h b/include/compat/strlcat.h
index b50c567..619e648 100644
--- a/include/compat/strlcat.h
+++ b/include/compat/strlcat.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_STRLCAT_H_INCLUDED
diff --git a/include/compat/strlcpy.h b/include/compat/strlcpy.h
index 54fdf5d..9d2f842 100644
--- a/include/compat/strlcpy.h
+++ b/include/compat/strlcpy.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_STRLCPY_H_INCLUDED
diff --git a/include/compat/strndup.h b/include/compat/strndup.h
index 3d68fc1..51a43b6 100644
--- a/include/compat/strndup.h
+++ b/include/compat/strndup.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef COMPAT_STRNDUP_H_INCLUDED
diff --git a/include/flopen.h b/include/flopen.h
index c4b7f75..4bd0209 100644
--- a/include/flopen.h
+++ b/include/flopen.h
@@ -24,7 +24,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
* Derived from:
* $FreeBSD: src/lib/libutil/libutil.h,v 1.44 2007/05/10 15:01:42 des Exp $
*/
diff --git a/include/http_headers.h b/include/http_headers.h
index b27966d..2ded005 100644
--- a/include/http_headers.h
+++ b/include/http_headers.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Argument list:
* ---------------------------------------
* a Http header name
diff --git a/include/http_response.h b/include/http_response.h
index 9c9dd9e..8477c43 100644
--- a/include/http_response.h
+++ b/include/http_response.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
HTTP_RESP(101, "Switching Protocols")
diff --git a/include/libvarnish.h b/include/libvarnish.h
index fb028d7..e706e55 100644
--- a/include/libvarnish.h
+++ b/include/libvarnish.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <errno.h>
diff --git a/include/libvcl.h b/include/libvcl.h
index ac41d8b..9b95ac1 100644
--- a/include/libvcl.h
+++ b/include/libvcl.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct vcc;
diff --git a/include/miniobj.h b/include/miniobj.h
index dfe7a59..e1db10d 100644
--- a/include/miniobj.h
+++ b/include/miniobj.h
@@ -3,7 +3,6 @@
*
* This file is in the public domain.
*
- * $Id$
*/
#define ALLOC_OBJ(to, type_magic) \
diff --git a/include/persistent.h b/include/persistent.h
index 8a355a7..57ac628 100644
--- a/include/persistent.h
+++ b/include/persistent.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*
diff --git a/include/svnid.h b/include/svnid.h
deleted file mode 100644
index cf06a94..0000000
--- a/include/svnid.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer
- * in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-#ifndef SVNID_H_INCLUDED
-#define SVNID_H_INCLUDED
-
-#define SVNID(id) \
- static const char * const svnid __attribute__((__unused__)) = id;
-
-#endif
diff --git a/include/varnishapi.h b/include/varnishapi.h
index fd1e3b5..7524842 100644
--- a/include/varnishapi.h
+++ b/include/varnishapi.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#ifndef VARNISHAPI_H_INCLUDED
diff --git a/include/vas.h b/include/vas.h
index 7632b16..6a4891f 100644
--- a/include/vas.h
+++ b/include/vas.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* assert(), AN() and AZ() are static checks that should not happen.
* In general asserts should be cheap, such as checking return
* values and similar.
diff --git a/include/vbm.h b/include/vbm.h
index f01c6ee..4b71b86 100644
--- a/include/vbm.h
+++ b/include/vbm.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Self-sizeing bitmap operations
*/
diff --git a/include/vct.h b/include/vct.h
index 6e9f2c7..0ed53a8 100644
--- a/include/vct.h
+++ b/include/vct.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <stdint.h>
diff --git a/include/vend.h b/include/vend.h
index 5ffe268..d27b533 100644
--- a/include/vend.h
+++ b/include/vend.h
@@ -26,8 +26,6 @@
* From:
* $FreeBSD: head/sys/sys/endian.h 121122 2003-10-15 20:05:57Z obrien $
*
- * $Id$
- *
* Endian conversion functions
*/
diff --git a/include/vev.h b/include/vev.h
index c9c5444..879fcdc 100644
--- a/include/vev.h
+++ b/include/vev.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <poll.h>
diff --git a/include/vin.h b/include/vin.h
index 1fc9cde..f0e0d95 100644
--- a/include/vin.h
+++ b/include/vin.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
*/
#ifndef VIN_H_INCLUDED
diff --git a/include/vlu.h b/include/vlu.h
index 60cfa17..e69c6ae 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -23,8 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Functions for assembling a bytestream into text-lines and calling
* a function on each.
*/
diff --git a/include/vmb.h b/include/vmb.h
index e50768b..a10eb5a 100644
--- a/include/vmb.h
+++ b/include/vmb.h
@@ -25,8 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Memory barriers
*
* XXX: It is utterly braindamaged, that no standard facility for this
diff --git a/include/vpf.h b/include/vpf.h
index d9b9505..8845ee7 100644
--- a/include/vpf.h
+++ b/include/vpf.h
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
* Derived from:
* $FreeBSD: src/lib/libutil/libutil.h,v 1.41 2005/08/24 17:21:38 pjd Exp $
*/
diff --git a/include/vqueue.h b/include/vqueue.h
index d5eb32b..8ffd820 100644
--- a/include/vqueue.h
+++ b/include/vqueue.h
@@ -28,7 +28,6 @@
*
* @(#)queue.h 8.5 (Berkeley) 8/20/94
* $FreeBSD: src/sys/sys/queue.h,v 1.68 2006/10/24 11:20:29 ru Exp $
- * $Id$
*/
#ifndef VARNISH_QUEUE_H
diff --git a/include/vre.h b/include/vre.h
index 67afd48..8d3ad55 100644
--- a/include/vre.h
+++ b/include/vre.h
@@ -25,8 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Regular expression support
*
*/
diff --git a/include/vrt.h b/include/vrt.h
index 4ed137e..18ebab7 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Runtime support for compiled VCL programs.
*
* XXX: When this file is changed, lib/libvcl/generate.py *MUST* be rerun.
diff --git a/include/vsc.h b/include/vsc.h
index f466542..1e714c7 100644
--- a/include/vsc.h
+++ b/include/vsc.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include <stdint.h>
diff --git a/include/vsc_all.h b/include/vsc_all.h
index cde9c65..1ac9415 100644
--- a/include/vsc_all.h
+++ b/include/vsc_all.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
diff --git a/include/vsc_fields.h b/include/vsc_fields.h
index ffb56db..a77939c 100644
--- a/include/vsc_fields.h
+++ b/include/vsc_fields.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vsc_fields.h 4857 2010-05-25 10:47:20Z phk $
- *
* 3rd argument marks fields for inclusion in the per worker-thread
* stats structure.
*/
diff --git a/include/vsl.h b/include/vsl.h
index 8699d68..222167a 100644
--- a/include/vsl.h
+++ b/include/vsl.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Define the layout of the shared memory log segment.
*
* NB: THIS IS NOT A PUBLIC API TO VARNISH!
diff --git a/include/vsl_tags.h b/include/vsl_tags.h
index 6a28832..088ea93 100644
--- a/include/vsl_tags.h
+++ b/include/vsl_tags.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Define the tags in the shared memory in a reusable format.
* Whoever includes this get to define what the SLTM macro does.
*
diff --git a/include/vsm.h b/include/vsm.h
index 2beb530..0f67b1e 100644
--- a/include/vsm.h
+++ b/include/vsm.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Define the layout of the shared memory log segment.
*
* NB: THIS IS NOT A PUBLIC API TO VARNISH!
diff --git a/include/vss.h b/include/vss.h
index 2f21721..5726685 100644
--- a/include/vss.h
+++ b/include/vss.h
@@ -24,7 +24,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/* vss.c */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ff096b..21146dc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
SUBDIRS = \
libvarnishcompat \
diff --git a/lib/libvarnish/argv.c b/lib/libvarnish/argv.c
index 2d5b5e0..b2f4243 100644
--- a/lib/libvarnish/argv.c
+++ b/lib/libvarnish/argv.c
@@ -38,9 +38,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/lib/libvarnish/assert.c b/lib/libvarnish/assert.c
index ed85e46..2b74e80 100644
--- a/lib/libvarnish/assert.c
+++ b/lib/libvarnish/assert.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 125f7a2..34ca793 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -34,9 +34,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <unistd.h>
#include <stdlib.h>
diff --git a/lib/libvarnish/cli_auth.c b/lib/libvarnish/cli_auth.c
index 36d39eb..b726eba 100644
--- a/lib/libvarnish/cli_auth.c
+++ b/lib/libvarnish/cli_auth.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/lib/libvarnish/cli_common.c b/lib/libvarnish/cli_common.c
index c0efc27..4fa7429 100644
--- a/lib/libvarnish/cli_common.c
+++ b/lib/libvarnish/cli_common.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index 31bdfe6..a666654 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <poll.h>
#include <string.h>
diff --git a/lib/libvarnish/flopen.c b/lib/libvarnish/flopen.c
index 5e5d68a..43882fe 100644
--- a/lib/libvarnish/flopen.c
+++ b/lib/libvarnish/flopen.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libvarnish/num.c b/lib/libvarnish/num.c
index 3c74fa3..7ba587e 100644
--- a/lib/libvarnish/num.c
+++ b/lib/libvarnish/num.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libvarnish/subproc.c b/lib/libvarnish/subproc.c
index 5c4aaac..677405e 100644
--- a/lib/libvarnish/subproc.c
+++ b/lib/libvarnish/subproc.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libvarnish/tcp.c b/lib/libvarnish/tcp.c
index ac54d57..bed3b99 100644
--- a/lib/libvarnish/tcp.c
+++ b/lib/libvarnish/tcp.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvarnish/time.c b/lib/libvarnish/time.c
index 02d4430..4c7abe7 100644
--- a/lib/libvarnish/time.c
+++ b/lib/libvarnish/time.c
@@ -46,9 +46,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/time.h>
#include <stdio.h>
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index 1b49088..b3e2d6f 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdint.h>
#include <vct.h>
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index e5472a1..3e1c5ce 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include "libvarnish.h"
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index 8bf77e9..c44c38c 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <errno.h>
#include <poll.h>
diff --git a/lib/libvarnish/vin.c b/lib/libvarnish/vin.c
index 8bcb4aa..8ebd5fd 100644
--- a/lib/libvarnish/vin.c
+++ b/lib/libvarnish/vin.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 549b683..db107a1 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/lib/libvarnish/vpf.c b/lib/libvarnish/vpf.c
index 6535d84..f0db8e9 100644
--- a/lib/libvarnish/vpf.c
+++ b/lib/libvarnish/vpf.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/lib/libvarnish/vsb.3 b/lib/libvarnish/vsb.3
index de3ff09..e0968c7 100644
--- a/lib/libvarnish/vsb.3
+++ b/lib/libvarnish/vsb.3
@@ -23,7 +23,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id$
.\" $FreeBSD: src/share/man/man9/vsb.9,v 1.25 2005/12/23 11:49:52 phk Exp $
.\"
.\" XXX
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index bdc40b1..d3f044d 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -29,9 +29,6 @@ __FBSDID("$FreeBSD: head/sys/kern/subr_vsb.c 212750 2010-09-16 16:13:12Z mdf $
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/lib/libvarnish/vsha256.c b/lib/libvarnish/vsha256.c
index d074bdb..83dd6a1 100644
--- a/lib/libvarnish/vsha256.c
+++ b/lib/libvarnish/vsha256.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdint.h>
#include <string.h>
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 29da71b..dfad6f7 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvarnish/vtmpfile.c b/lib/libvarnish/vtmpfile.c
index 9eddc4a..9b5c1b2 100644
--- a/lib/libvarnish/vtmpfile.c
+++ b/lib/libvarnish/vtmpfile.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index 5879f74..d60dd13 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
diff --git a/lib/libvarnishapi/base64.c b/lib/libvarnishapi/base64.c
index feb10f1..f55199d 100644
--- a/lib/libvarnishapi/base64.c
+++ b/lib/libvarnishapi/base64.c
@@ -6,9 +6,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include "varnishapi.h"
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index f912514..5b870d5 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 5014b38..6d5f4e5 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index 0ae2870..29e0b4b 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
struct vsl {
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 0f02355..bc610f2 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index d6463ac..b0adc96 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/lib/libvarnishapi/vsm_api.h b/lib/libvarnishapi/vsm_api.h
index b25f768..f88e0ee 100644
--- a/lib/libvarnishapi/vsm_api.h
+++ b/lib/libvarnishapi/vsm_api.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/* Parameters */
diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am
index f5b363e..a75daeb 100644
--- a/lib/libvarnishcompat/Makefile.am
+++ b/lib/libvarnishcompat/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include
diff --git a/lib/libvarnishcompat/daemon.c b/lib/libvarnishcompat/daemon.c
index b88c39f..ef14e23 100644
--- a/lib/libvarnishcompat/daemon.c
+++ b/lib/libvarnishcompat/daemon.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_DAEMON
#include <errno.h>
diff --git a/lib/libvarnishcompat/execinfo.c b/lib/libvarnishcompat/execinfo.c
index 8636a02..b1a17cf 100644
--- a/lib/libvarnishcompat/execinfo.c
+++ b/lib/libvarnishcompat/execinfo.c
@@ -26,9 +26,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $")
-
#ifndef HAVE_BACKTRACE
#include "compat/execinfo.h"
diff --git a/lib/libvarnishcompat/setproctitle.c b/lib/libvarnishcompat/setproctitle.c
index 8d15259..a8d46d1 100644
--- a/lib/libvarnishcompat/setproctitle.c
+++ b/lib/libvarnishcompat/setproctitle.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_SETPROCTITLE
#include <stdarg.h>
diff --git a/lib/libvarnishcompat/srandomdev.c b/lib/libvarnishcompat/srandomdev.c
index 8097c13..47ae815 100644
--- a/lib/libvarnishcompat/srandomdev.c
+++ b/lib/libvarnishcompat/srandomdev.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_SRANDOMDEV
#include <sys/time.h>
diff --git a/lib/libvarnishcompat/strlcat.c b/lib/libvarnishcompat/strlcat.c
index 7d0368c..387650d 100644
--- a/lib/libvarnishcompat/strlcat.c
+++ b/lib/libvarnishcompat/strlcat.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
@@ -19,9 +18,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_STRLCAT
#include <sys/types.h>
diff --git a/lib/libvarnishcompat/strlcpy.c b/lib/libvarnishcompat/strlcpy.c
index 1aed2f8..aef313a 100644
--- a/lib/libvarnishcompat/strlcpy.c
+++ b/lib/libvarnishcompat/strlcpy.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
/*
@@ -19,9 +18,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_STRLCPY
#include <sys/types.h>
diff --git a/lib/libvarnishcompat/strndup.c b/lib/libvarnishcompat/strndup.c
index 2de04ff..e39a489 100644
--- a/lib/libvarnishcompat/strndup.c
+++ b/lib/libvarnishcompat/strndup.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#ifndef HAVE_STRNDUP
#include <stdlib.h>
diff --git a/lib/libvcl/Makefile.am b/lib/libvcl/Makefile.am
index c594885..fa61423 100644
--- a/lib/libvcl/Makefile.am
+++ b/lib/libvcl/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index 262b25b..06620e5 100755
--- a/lib/libvcl/generate.py
+++ b/lib/libvcl/generate.py
@@ -29,8 +29,6 @@
#
# Generate various .c and .h files for the VCL compiler and the interfaces
# for it.
-#
-# $Id$
#######################################################################
# These are our tokens
diff --git a/lib/libvcl/symbol_kind.h b/lib/libvcl/symbol_kind.h
index 58b7a18..89422de 100644
--- a/lib/libvcl/symbol_kind.h
+++ b/lib/libvcl/symbol_kind.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*lint -save -e525 -e539 */
diff --git a/lib/libvcl/vcc_acl.c b/lib/libvcl/vcc_acl.c
index 3412097..6d7e629 100644
--- a/lib/libvcl/vcc_acl.c
+++ b/lib/libvcl/vcc_acl.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/lib/libvcl/vcc_action.c b/lib/libvcl/vcc_action.c
index dd36d23..fdb2c63 100644
--- a/lib/libvcl/vcc_action.c
+++ b/lib/libvcl/vcc_action.c
@@ -32,9 +32,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_backend.c b/lib/libvcl/vcc_backend.c
index e0e7279..e8cd700 100644
--- a/lib/libvcl/vcc_backend.c
+++ b/lib/libvcl/vcc_backend.c
@@ -50,9 +50,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvcl/vcc_backend_util.c b/lib/libvcl/vcc_backend_util.c
index 0c9de3c..2bde38d 100644
--- a/lib/libvcl/vcc_backend_util.c
+++ b/lib/libvcl/vcc_backend_util.c
@@ -30,9 +30,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_compile.c b/lib/libvcl/vcc_compile.c
index 3a518b8..103c141 100644
--- a/lib/libvcl/vcc_compile.c
+++ b/lib/libvcl/vcc_compile.c
@@ -52,9 +52,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/stat.h>
#include <ctype.h>
diff --git a/lib/libvcl/vcc_compile.h b/lib/libvcl/vcc_compile.h
index 8453f1a..df2c01f 100644
--- a/lib/libvcl/vcc_compile.h
+++ b/lib/libvcl/vcc_compile.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
#include "vqueue.h"
diff --git a/lib/libvcl/vcc_dir_dns.c b/lib/libvcl/vcc_dir_dns.c
index e24dcc4..4fff785 100644
--- a/lib/libvcl/vcc_dir_dns.c
+++ b/lib/libvcl/vcc_dir_dns.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvcl/vcc_dir_random.c b/lib/libvcl/vcc_dir_random.c
index 1831bed..091d4d7 100644
--- a/lib/libvcl/vcc_dir_random.c
+++ b/lib/libvcl/vcc_dir_random.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvcl/vcc_dir_round_robin.c b/lib/libvcl/vcc_dir_round_robin.c
index 731e920..5292adf 100644
--- a/lib/libvcl/vcc_dir_round_robin.c
+++ b/lib/libvcl/vcc_dir_round_robin.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 659b8b9..14ddf0b 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -31,9 +31,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libvcl/vcc_parse.c b/lib/libvcl/vcc_parse.c
index 535ecc2..8f694d3 100644
--- a/lib/libvcl/vcc_parse.c
+++ b/lib/libvcl/vcc_parse.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_priv.h b/lib/libvcl/vcc_priv.h
index 12c0e04..ae5c712 100644
--- a/lib/libvcl/vcc_priv.h
+++ b/lib/libvcl/vcc_priv.h
@@ -26,8 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
- *
* Stuff shared between main.c and fixed_token.c
*/
diff --git a/lib/libvcl/vcc_storage.c b/lib/libvcl/vcc_storage.c
index 5263595..1acb2ed 100644
--- a/lib/libvcl/vcc_storage.c
+++ b/lib/libvcl/vcc_storage.c
@@ -54,9 +54,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libvcl/vcc_string.c b/lib/libvcl/vcc_string.c
index b7c8ede..ed42fa2 100644
--- a/lib/libvcl/vcc_string.c
+++ b/lib/libvcl/vcc_string.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_symb.c b/lib/libvcl/vcc_symb.c
index 5ef4130..6c457b4 100644
--- a/lib/libvcl/vcc_symb.c
+++ b/lib/libvcl/vcc_symb.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_token.c b/lib/libvcl/vcc_token.c
index 56c9672..14040b3 100644
--- a/lib/libvcl/vcc_token.c
+++ b/lib/libvcl/vcc_token.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libvcl/vcc_types.h b/lib/libvcl/vcc_types.h
index aeaec90..959fe8e 100644
--- a/lib/libvcl/vcc_types.h
+++ b/lib/libvcl/vcc_types.h
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
*/
/*lint -save -e525 -e539 */
diff --git a/lib/libvcl/vcc_var.c b/lib/libvcl/vcc_var.c
index 8bec564..cb9054a 100644
--- a/lib/libvcl/vcc_var.c
+++ b/lib/libvcl/vcc_var.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_vmod.c b/lib/libvcl/vcc_vmod.c
index 45fe1cd..731b26d 100644
--- a/lib/libvcl/vcc_vmod.c
+++ b/lib/libvcl/vcc_vmod.c
@@ -28,9 +28,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include <dlfcn.h>
#include <string.h>
diff --git a/lib/libvcl/vcc_xref.c b/lib/libvcl/vcc_xref.c
index a2c76f3..f76d910 100644
--- a/lib/libvcl/vcc_xref.c
+++ b/lib/libvcl/vcc_xref.c
@@ -39,9 +39,6 @@
#include "config.h"
-#include "svnid.h"
-SVNID("$Id$")
-
#include <stdio.h>
#include "vsb.h"
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index 20dc86b..c04242c 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
pkglib_LTLIBRARIES = libvgz.la
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index a284b09..7ddd0ac 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
diff --git a/lib/libvmod_std/vmod.py b/lib/libvmod_std/vmod.py
index 4ad37d0..5ff69f0 100755
--- a/lib/libvmod_std/vmod.py
+++ b/lib/libvmod_std/vmod.py
@@ -36,8 +36,6 @@
# size of this structure in bytes, and the definition of the structure
# as a string, suitable for inclusion in the C-source of the compile VCL
# program.
-#
-# $Id$
import sys
import re
diff --git a/man/Makefile.am b/man/Makefile.am
index 2a1e36c..bc662b6 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
dist_man_MANS = vcl.7 varnish-cli.7
MAINTAINERCLEANFILES = $(dist_man_MANS)
diff --git a/redhat/Makefile.am b/redhat/Makefile.am
index 22a11bd..86ddfd4 100644
--- a/redhat/Makefile.am
+++ b/redhat/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+#
EXTRA_DIST = \
README.redhat \
More information about the varnish-commit
mailing list