tests: Remove not needed CONFIG_ZVFS_OPEN_MAX option

jukkar · jukkar · commit e29d9165eb3b · 2025-10-17T12:09:45.000+03:00
Either remove the option from conf file or adjust its value
by using CONFIG_ZVFS_OPEN_ADD_SIZE_NET option because the
max number of socket descriptors is now calculated dynamically
at built time.

Signed-off-by: Jukka Rissanen &lt;jukka.rissanen@nordicsemi.no&gt;
diff --git a/tests/modules/thrift/ThriftTest/overlay-tls.conf b/tests/modules/thrift/ThriftTest/overlay-tls.conf
@@ -8,13 +8,12 @@ CONFIG_THRIFT_SSL_SOCKET=y
 #
 # File Descriptor Usage
 # ---------------------
-# stdin, stdout, stderr: 3
 # tcp socket (accept): 1
 # tls socket (accept): 1
 # tcp sockets (client, server): 2
 # tls sockets (client, server): 2
 # socketpairs for cancellation (accept, client, server): 6
-CONFIG_ZVFS_OPEN_MAX=15
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=12
 
 # TLS configuration
 CONFIG_MBEDTLS=y
diff --git a/tests/modules/thrift/ThriftTest/prj.conf b/tests/modules/thrift/ThriftTest/prj.conf
@@ -41,19 +41,6 @@ CONFIG_NET_PKT_TX_COUNT=20
 CONFIG_NET_BUF_RX_COUNT=20
 CONFIG_NET_PKT_RX_COUNT=20
 
-# We can get away with using fewer sockets in the non-TLS tests because we use
-# TFDServer.cpp for our server and socketpair() for our channel. We do not
-# need an accept socket for the server (in contrast to TCP), it only needs 1
-# eventfd for server cancellation, and there are no cancellation sockets
-# required because we close them in the testsuite.
-#
-# File Descriptor Usage
-# ---------------------
-# stdin, stdout, stderr: 3
-# socketpair for channel: 2
-# eventfd for cancellation: 1
-CONFIG_ZVFS_OPEN_MAX=6
-
 # Network address config
 CONFIG_NET_IPV4=y
 CONFIG_NET_CONFIG_SETTINGS=y
diff --git a/tests/net/lib/dns_addremove/prj.conf b/tests/net/lib/dns_addremove/prj.conf
@@ -17,5 +17,4 @@ CONFIG_NET_ARP=n
 CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_ZVFS_OPEN_MAX=5
 CONFIG_ZVFS_POLL_MAX=5
diff --git a/tests/net/lib/dns_dispatcher/prj.conf b/tests/net/lib/dns_dispatcher/prj.conf
@@ -15,7 +15,7 @@ CONFIG_NET_IPV6=y
 CONFIG_PRINTK=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=5
 CONFIG_ZVFS_POLL_MAX=10
 CONFIG_MDNS_RESPONDER=n
 CONFIG_MDNS_RESOLVER=n
diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf
@@ -30,5 +30,4 @@ CONFIG_ZTEST=y
 
 CONFIG_MAIN_STACK_SIZE=1344
 CONFIG_HEAP_MEM_POOL_SIZE=1024
-CONFIG_ZVFS_OPEN_MAX=9
 CONFIG_ZVFS_POLL_MAX=9
diff --git a/tests/net/lib/http_server/core/prj.conf b/tests/net/lib/http_server/core/prj.conf
@@ -7,7 +7,6 @@ CONFIG_POSIX_API=y
 
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_ZVFS_EVENTFD_MAX=10
 CONFIG_NET_MAX_CONTEXTS=10
diff --git a/tests/net/lib/http_server/crime/prj.conf b/tests/net/lib/http_server/crime/prj.conf
@@ -9,7 +9,6 @@ CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_ZTEST_STACK_SIZE=1024
 
-CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_ZVFS_EVENTFD_MAX=10
 CONFIG_NET_MAX_CONTEXTS=10
diff --git a/tests/net/lib/http_server/tls/prj.conf b/tests/net/lib/http_server/tls/prj.conf
@@ -46,7 +46,6 @@ CONFIG_NET_BUF_RX_COUNT=32
 CONFIG_NET_PKT_TX_COUNT=16
 CONFIG_NET_PKT_RX_COUNT=16
 CONFIG_ZVFS_POLL_MAX=32
-CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_ZVFS_EVENTFD_MAX=10
 CONFIG_NET_MAX_CONTEXTS=10
diff --git a/tests/net/lib/lwm2m/interop/boards/native_sim.conf b/tests/net/lib/lwm2m/interop/boards/native_sim.conf
@@ -8,4 +8,4 @@ CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
 CONFIG_ASAN=y
 CONFIG_NATIVE_EXTRA_CMDLINE_ARGS="--seed-random"
 CONFIG_HEAP_MEM_POOL_SIZE=32768
-CONFIG_ZVFS_OPEN_MAX=16
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=8
diff --git a/tests/net/lib/mdns_responder/prj.conf b/tests/net/lib/mdns_responder/prj.conf
@@ -5,7 +5,6 @@ CONFIG_NET_DRIVERS=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
-CONFIG_ZVFS_OPEN_MAX=7
 CONFIG_ZVFS_POLL_MAX=7
 
 # Network driver config
diff --git a/tests/net/pm/prj.conf b/tests/net/pm/prj.conf
@@ -7,7 +7,6 @@ CONFIG_NET_L2_ETHERNET=n
 CONFIG_NET_UDP=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=3
 CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_LOG=y
diff --git a/tests/net/pmtu/prj.conf b/tests/net/pmtu/prj.conf
@@ -21,6 +21,5 @@ CONFIG_NET_BUF_TX_COUNT=20
 CONFIG_NET_MGMT=y
 CONFIG_NET_MGMT_EVENT=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_NET_MAX_CONTEXTS=32
 CONFIG_NET_MAX_CONN=32
diff --git a/tests/net/socket/af_packet/prj.conf b/tests/net/socket/af_packet/prj.conf
@@ -6,7 +6,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_PACKET=y
-CONFIG_ZVFS_OPEN_MAX=8
 CONFIG_NET_IPV6_DAD=n
 CONFIG_NET_IPV6_MLD=n
 
diff --git a/tests/net/socket/poll/prj.conf b/tests/net/socket/poll/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=5
 CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=8
 CONFIG_NET_MAX_CONN=5
diff --git a/tests/net/socket/reuseaddr_reuseport/prj.conf b/tests/net/socket/reuseaddr_reuseport/prj.conf
@@ -28,7 +28,6 @@ CONFIG_NET_CONTEXT_REUSEPORT=y
 CONFIG_NET_HOSTNAME_ENABLE=y
 CONFIG_NET_HOSTNAME="ztest_hostname"
 
-CONFIG_ZVFS_OPEN_MAX=8
 CONFIG_NET_MAX_CONN=10
 CONFIG_NET_MAX_CONTEXTS=10
 
diff --git a/tests/net/socket/select/prj.conf b/tests/net/socket/select/prj.conf
@@ -10,7 +10,7 @@ CONFIG_NET_IPV4=n
 CONFIG_NET_IPV6=y
 CONFIG_NET_SOCKETS=y
 # Defines fd_set size
-CONFIG_ZVFS_OPEN_MAX=33
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=15
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/socket/service/prj.conf b/tests/net/socket/service/prj.conf
@@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=20
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=10
 CONFIG_NET_PKT_TX_COUNT=8
 CONFIG_NET_PKT_RX_COUNT=8
 CONFIG_NET_MAX_CONN=5
diff --git a/tests/net/socket/socketpair/prj.conf b/tests/net/socket/socketpair/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETPAIR=y
 CONFIG_NET_SOCKETPAIR_BUFFER_SIZE=64
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=5
 
 # Network driver config
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/net/socket/tcp/prj.conf b/tests/net/socket/tcp/prj.conf
@@ -11,7 +11,6 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_ND=n
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_NET_MAX_CONTEXTS=10
 CONFIG_NET_MAX_CONN=10
 
diff --git a/tests/net/socket/tls/prj.conf b/tests/net/socket/tls/prj.conf
@@ -19,7 +19,7 @@ CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=4
 CONFIG_NET_CONTEXT_RCVTIMEO=y
 CONFIG_NET_CONTEXT_SNDTIMEO=y
 CONFIG_NET_CONTEXT_RCVBUF=y
-CONFIG_ZVFS_OPEN_MAX=20
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=10
 
 # Keep timings short for the test
 CONFIG_NET_TCP_TIME_WAIT_DELAY=10
diff --git a/tests/net/socket/tls_ext/prj.conf b/tests/net/socket/tls_ext/prj.conf
@@ -31,7 +31,7 @@ CONFIG_NET_BUF_TX_COUNT=64
 CONFIG_NET_PKT_TX_COUNT=64
 CONFIG_NET_BUF_RX_COUNT=64
 CONFIG_NET_PKT_RX_COUNT=64
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=5
 
 # Stack sizes
 CONFIG_MAIN_STACK_SIZE=2048
diff --git a/tests/net/socket/udp/prj.conf b/tests/net/socket/udp/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=10
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET=5
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
 CONFIG_NET_IPV6_DAD=n
 CONFIG_NET_IPV6_MLD=n
