[master] 6434572 More badvcl->errvcl conversions.

[Poul-Henning Kamp]

commit 6434572b005dbbe59bc410051da359a025a71ce3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 24 21:55:50 2012 +0000

    More badvcl->errvcl conversions.
    
    Now only 100 more to go.

diff --git a/bin/varnishtest/tests/c00041.vtc b/bin/varnishtest/tests/c00041.vtc
index 78e8af2..c51cf53 100644
--- a/bin/varnishtest/tests/c00041.vtc
+++ b/bin/varnishtest/tests/c00041.vtc
@@ -92,7 +92,7 @@ client c1 {
 	expect resp.bodylen == 22
 } -run
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {'purge': not a valid action in method 'vcl_recv'.} {
 	backend s1 { .host = "${s1_addr}"; }
 	sub vcl_recv { if (req.http.purge == "yes") { purge; } }
 } 
diff --git a/bin/varnishtest/tests/c00052.vtc b/bin/varnishtest/tests/c00052.vtc
index e640230..5de1430 100644
--- a/bin/varnishtest/tests/c00052.vtc
+++ b/bin/varnishtest/tests/c00052.vtc
@@ -15,14 +15,14 @@ varnish v1 -vcl+backend {
 
 varnish v1 -cliok "param.set vcc_allow_inline_c false"
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Inline-C not allowed} {
 	backend default {
 		.host = "${s1_sock}";
 	}
 	C{ getpid(); }C
 }
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Inline-C not allowed} {
 	backend default {
 		.host = "${s1_sock}";
 	}
diff --git a/bin/varnishtest/tests/c00053.vtc b/bin/varnishtest/tests/c00053.vtc
index c326293..a5c2264 100644
--- a/bin/varnishtest/tests/c00053.vtc
+++ b/bin/varnishtest/tests/c00053.vtc
@@ -13,7 +13,7 @@ varnish v1 -vcl+backend {
 
 varnish v1 -cliok "param.set vcc_unsafe_path off"
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Include path is unsafe} {
 	backend default {
 		.host = "${s1_sock}";
 	}
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index c26c766..9233628 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -29,14 +29,14 @@ client c1 {
 	expect resp.http.bar == "foo"
 } -run
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Wrong enum value.  Expected one of:} {
 	import debug from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so" ;
 	sub vcl_deliver {
 		set resp.http.who = debug.author(jfk);
 	}
 }
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Wrong argument type.  Expected REAL.  Got STRING.} {
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 	sub vcl_deliver {
 		set resp.http.who = std.random("foo", "bar");
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index 67d984d..0251a77 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -26,6 +26,6 @@ client c1 {
 	expect resp.http.bar == "foo"
 } -run
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {Expected 'from path...'} {
 	import std to;
 }
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index 9da650c..c35cc38 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -27,7 +27,7 @@ client c1 {
 	expect resp.bodylen == 1
 } -run
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {'beresp.http.bar': Not available in method 'vcl_recv'}  {
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
 	backend b { .host = "127.0.0.1"; }
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
index 3d1d665..30d39b7 100644
--- a/bin/varnishtest/tests/m00008.vtc
+++ b/bin/varnishtest/tests/m00008.vtc
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
 
 varnish v1 -cliok "param.set vcc_unsafe_path off"
 
-varnish v1 -badvcl {
+varnish v1 -errvcl {'import ... from path...' not allowed.} {
 	backend default { .host = "${s1_sock}"; }
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 }