Polish, yet again, specific sizes to make this pass on both

32 and 64 bit architectures.

The good news is that this is necessary because our obj overhead
decreases.

bin/varnishtest/tests/b00018.vtc

@@ -16,12 +16,15 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+varnish v1 -cliok "param.set default_grace 0"
+varnish v1 -cliok "param.set default_keep 0"
+
 client c1 {
 	txreq -url "/"
 	rxresp
 	expect resp.status == 523
 } -run
 
-delay 10
+delay 4
 
 varnish v1 -expect n_object == 0

bin/varnishtest/tests/c00044.vtc

@@ -2,17 +2,17 @@ varnishtest	"Object/LRU/Stevedores"
 
 server s1 {
 	rxreq
-	txresp -bodylen 1048182
+	txresp -bodylen 1048190
 	rxreq
-	txresp -bodylen 1048183
+	txresp -bodylen 1048191
 	rxreq
-	txresp -bodylen 1048184
+	txresp -bodylen 1048192
 
 	rxreq
-	txresp -bodylen 1048185
+	txresp -bodylen 1048193
 
 	rxreq
-	txresp -bodylen 1048186
+	txresp -bodylen 1048194
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
@@ -27,7 +27,7 @@ client c1 {
 	txreq -url /foo
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048182
+	expect resp.bodylen == 1048190
 } -run
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
@@ -42,7 +42,7 @@ client c1 {
 	txreq -url /bar
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048183
+	expect resp.bodylen == 1048191
 } -run
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
@@ -57,7 +57,7 @@ client c1 {
 	txreq -url /burp
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048184
+	expect resp.bodylen == 1048192
 } -run
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
@@ -72,7 +72,7 @@ client c1 {
 	txreq -url /foo1
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048185
+	expect resp.bodylen == 1048193
 } -run
 
 varnish v1 -expect n_lru_nuked == 1
@@ -81,7 +81,7 @@ client c1 {
 	txreq -url /foo
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048186
+	expect resp.bodylen == 1048194
 } -run
 
 varnish v1 -expect n_lru_nuked == 2

bin/varnishtest/tests/c00045.vtc

@@ -2,11 +2,11 @@ varnishtest	"Object/LRU/Stevedores with hinting"
 
 server s1 {
 	rxreq
-	txresp -bodylen 1048180
+	txresp -bodylen 1048188
 	rxreq
-	txresp -bodylen 1048181
+	txresp -bodylen 1048189
 	rxreq
-	txresp -bodylen 1048182
+	txresp -bodylen 1048190
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
@@ -21,7 +21,7 @@ client c1 {
 	txreq -url /foo
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048180
+	expect resp.bodylen == 1048188
 } -run
 
 varnish v1 -expect SMA.Transient.g_bytes == 0
@@ -36,7 +36,7 @@ client c1 {
 	txreq -url /bar
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048181
+	expect resp.bodylen == 1048189
 } -run
 
 varnish v1 -expect n_lru_nuked == 1
@@ -52,7 +52,7 @@ client c1 {
 	txreq -url /foo
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048182
+	expect resp.bodylen == 1048190
 } -run
 
 varnish v1 -expect n_lru_nuked == 2

bin/varnishtest/tests/r01140.vtc

@@ -4,7 +4,7 @@ server s1 {
 	# This response should almost completely fill the storage
 	rxreq
 	expect req.url == /url1
-	txresp -bodylen 1048108
+	txresp -bodylen 1048208
 
 	# The next one should not fit in the storage, ending up in transient
 	# with zero ttl (=shortlived)
@@ -29,7 +29,7 @@ client c1 {
 	txreq -url /url1
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 1048108
+	expect resp.bodylen == 1048208
 } -run
 
 delay .1

bin/varnishtest/tests/r01283.vtc

@@ -2,7 +2,7 @@ varnishtest "#1283 - Test failure to allocate object for error (transient full)"
 
 server s1 {
 	rxreq
-	txresp -bodylen 1048148
+	txresp -bodylen 1048198
 } -start
 
 varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend {

bin/varnishtest/tests/r01284.vtc

@@ -3,7 +3,7 @@ varnishtest "#1284 - Test resource cleanup after STV_NewObject fail in fetch"
 server s1 {
 	rxreq
 	expect req.url == "/obj1"
-	txresp -bodylen 1048140
+	txresp -bodylen 1048190
 	rxreq
 	expect req.url == "/obj2"
 	txresp -hdr "Long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -hdr "Long2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"