Merge r3573: Add a counter for esi parse errors and test it in all ESI related tests cases.

git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@3742 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_vrt_esi.c

@@ -95,6 +95,7 @@ esi_error(const struct esi_work *ew, const char *p, int i, const char *err)
 	char buf[256], *q;
 	txt t;
 
+	VSL_stats->esi_errors++;
 	if (i == 0)
 		i = p - ew->t.b;
 	if (i > 20) {

bin/varnishtest/tests/e00000.vtc

@@ -24,3 +24,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00001.vtc

@@ -27,3 +27,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00002.vtc

@@ -28,3 +28,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00003.vtc

@@ -32,3 +32,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00004.vtc

@@ -32,3 +32,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00005.vtc

@@ -33,3 +33,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00006.vtc

@@ -44,3 +44,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00007.vtc

@@ -47,3 +47,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00008.vtc

@@ -71,3 +71,4 @@ client c1 {
 }
 
 client c1 -run
+varnish v1 -expect esi_errors == 15

bin/varnishtest/tests/e00009.vtc

@@ -44,3 +44,4 @@ client c1 {
 	expect resp.bodylen == 37
 	expect resp.http.transfer-encoding == "chunked"
 } -run
+varnish v1 -expect esi_errors == 1

bin/varnishtest/tests/e00010.vtc

@@ -25,3 +25,4 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 21
 } -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00011.vtc

@@ -34,3 +34,4 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 31
 } -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00012.vtc

@@ -44,3 +44,4 @@ client c1 {
         expect resp.status == 200
         expect resp.bodylen == 151
 } -run
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00013.vtc

@@ -23,3 +23,4 @@ client c1 {
 } -run
 
 varnish v1 -expect esi_parse == 0
+varnish v1 -expect esi_errors == 0

bin/varnishtest/tests/e00014.vtc

@@ -24,3 +24,4 @@ client c1 {
 } -run
 
 varnish v1 -expect esi_parse == 0
+varnish v1 -expect esi_errors == 0

include/stat_field.h

@@ -132,3 +132,4 @@ MAC_STAT(hcb_lock,		uint64_t, 'a', "HCB Lookups with lock")
 MAC_STAT(hcb_insert,		uint64_t, 'a', "HCB Inserts")
 
 MAC_STAT(esi_parse,		uint64_t, 'a', "Objects ESI parsed (unlock)")
+MAC_STAT(esi_errors,		uint64_t, 'a', "ESI parse errors (unlock)")