[master] 55fecc94d vtc: Bump stack for ESI tests tight on 32bit systems

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Mar 1 11:38:06 UTC 2024


commit 55fecc94d3ca59ab156f1e76746bbeefeaec07d8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Mar 1 12:34:09 2024 +0100

    vtc: Bump stack for ESI tests tight on 32bit systems
    
    Refs #4063

diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index 142032366..180f1a769 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -26,10 +26,11 @@ server s1 {
 	}
 } -start
 
-varnish v1 \
-	-syntax 4.0 \
-	-arg "-p feature=+esi_disable_xml_check" \
-	-vcl+backend {
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+varnish v1 -cliok "param.set feature +esi_disable_xml_check"
+
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/e00030.vtc b/bin/varnishtest/tests/e00030.vtc
index ff2016fb9..424207020 100644
--- a/bin/varnishtest/tests/e00030.vtc
+++ b/bin/varnishtest/tests/e00030.vtc
@@ -1,7 +1,6 @@
 varnishtest "Test req_top.* in an ESI context"
 
-varnish v1 -arg "-p feature=+esi_disable_xml_check" \
-	   -errvcl {Variable is read only.} {
+varnish v1 -errvcl {Variable is read only.} {
 	backend foo None;
 
 	sub vcl_recv {
@@ -52,6 +51,10 @@ server s1 {
 	txresp
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+varnish v1 -cliok "param.set feature +esi_disable_xml_check"
+
 varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.esi_level > 0) {
diff --git a/bin/varnishtest/tests/e00034.vtc b/bin/varnishtest/tests/e00034.vtc
index 2749b3df3..b0e93ba8e 100644
--- a/bin/varnishtest/tests/e00034.vtc
+++ b/bin/varnishtest/tests/e00034.vtc
@@ -72,6 +72,9 @@ server s1 {
 	}
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+
 varnish v1 -syntax 4.1 -vcl+backend {
 	import debug;
 
diff --git a/bin/varnishtest/tests/l00003.vtc b/bin/varnishtest/tests/l00003.vtc
index 1e94845df..5ecef3faa 100644
--- a/bin/varnishtest/tests/l00003.vtc
+++ b/bin/varnishtest/tests/l00003.vtc
@@ -14,6 +14,9 @@ server s1 {
 	txresp -body {123}
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		if (bereq.url != "/2") {
diff --git a/bin/varnishtest/tests/r01737.vtc b/bin/varnishtest/tests/r01737.vtc
index 845b1de3a..454bd96e8 100644
--- a/bin/varnishtest/tests/r01737.vtc
+++ b/bin/varnishtest/tests/r01737.vtc
@@ -23,7 +23,11 @@ server s1 {
 	rxresp
 } -start
 
-varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+varnish v1 -cliok "param.set feature +esi_disable_xml_check"
+
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/r01781.vtc b/bin/varnishtest/tests/r01781.vtc
index 4801d0613..31e21bf9a 100644
--- a/bin/varnishtest/tests/r01781.vtc
+++ b/bin/varnishtest/tests/r01781.vtc
@@ -13,7 +13,11 @@ server s1 {
 	txresp -body {Foo}
 } -start
 
-varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+varnish v1 -cliok "param.set feature +esi_disable_xml_check"
+
+varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_gzip = true;
 		set beresp.do_esi = true;
diff --git a/bin/varnishtest/tests/r01878.vtc b/bin/varnishtest/tests/r01878.vtc
index 14831d35b..2d8a0f1fa 100644
--- a/bin/varnishtest/tests/r01878.vtc
+++ b/bin/varnishtest/tests/r01878.vtc
@@ -14,6 +14,9 @@ server s1 {
 	txresp -hdr "id: bar" -body "<3>bar</3>"
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		if (bereq.url != "/bar") {
diff --git a/bin/varnishtest/tests/r02849.vtc b/bin/varnishtest/tests/r02849.vtc
index 3022bcf78..f7860ab35 100644
--- a/bin/varnishtest/tests/r02849.vtc
+++ b/bin/varnishtest/tests/r02849.vtc
@@ -22,6 +22,9 @@ server s1 {
 	txresp -body {<P2/><esi:include src="/l3"/><P2/>}
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+
 varnish v1 -vcl+backend {
 	sub vcl_recv {
 		if (req.url == "/l3") {
diff --git a/bin/varnishtest/tests/v00042.vtc b/bin/varnishtest/tests/v00042.vtc
index b378a2731..3d77175ea 100644
--- a/bin/varnishtest/tests/v00042.vtc
+++ b/bin/varnishtest/tests/v00042.vtc
@@ -33,6 +33,9 @@ server s1 {
 	txresp
 } -start
 
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+
 varnish v1 -vcl+backend {
 	import debug;
 
diff --git a/bin/varnishtest/tests/v00043.vtc b/bin/varnishtest/tests/v00043.vtc
index 49edc6b1a..0d9e6cb93 100644
--- a/bin/varnishtest/tests/v00043.vtc
+++ b/bin/varnishtest/tests/v00043.vtc
@@ -71,7 +71,11 @@ varnish v1 -errvcl "Not available in subroutine 'vcl_init'" {
 	}
 }
 
-varnish v1 -cliok "param.set debug +syncvsl" -vcl+backend {
+# give enough stack to 32bit systems
+varnish v1 -cliok "param.set thread_pool_stack 80k"
+varnish v1 -cliok "param.set debug +syncvsl"
+
+varnish v1 -vcl+backend {
 	import debug;
 
 	sub vcl_init {


More information about the varnish-commit mailing list