Skip to content

Commit

Permalink
samples: thrift: hello_client: clean up hello_client sample.yaml
Browse files Browse the repository at this point in the history
Tested all configurations against programes compiled for the host
which are built with `.../hello_server/Makefile`.

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
  • Loading branch information
cfriedt committed Jan 21, 2023
1 parent 6bf8ce0 commit 7be189f
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 38 deletions.
23 changes: 13 additions & 10 deletions samples/lib/thrift/hello_client/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ CONFIG_POSIX_MAX_FDS=6
CONFIG_NET_CONNECTION_MANAGER=y

# Kernel options
CONFIG_MAIN_STACK_SIZE=4096
CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_INIT_STACKS=y
Expand All @@ -54,19 +53,23 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4
CONFIG_NET_MAX_CONTEXTS=10

# Network shell
CONFIG_NET_SHELL=y
CONFIG_SHELL=y

# Network application options and configuration
CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_CONFIG_NEED_IPV6=y
CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2"
CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1"
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"

# Number of socket descriptors might need adjusting
# if there are more than 1 handlers defined.
CONFIG_POSIX_MAX_FDS=12
CONFIG_POSIX_MAX_FDS=16

# default stack sizes are not enough
CONFIG_MAIN_STACK_SIZE=8192
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=8192
CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
CONFIG_NET_MGMT_EVENT_STACK_SIZE=4096
CONFIG_IDLE_STACK_SIZE=4096
CONFIG_NET_RX_STACK_SIZE=8192
47 changes: 19 additions & 28 deletions samples/lib/thrift/hello_client/sample.yaml
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
sample:
description: Hello Thrift sample
name: hello thrift
description: Hello Thrift client sample
name: hello thrift client
common:
tags: thrift cpp
# FIXME: zephyrproject-rtos/zephyr#45100
arch_exclude: posix
filter: TOOLCHAIN_HAS_NEWLIB == 1
toolchain_exclude: xcc
arch_exclude: arc xtensa
# qemu_x86 exluded due to missing long double functions in SDK
# See https://github.com/zephyrproject-rtos/sdk-ng/issues/603
platform_exclude: qemu_x86
integration_platforms:
- mps2_an385
- qemu_cortex_a53
- qemu_riscv32
- qemu_riscv64_smp
- qemu_x86_64
tags: thrift cpp sample
tests:
thrift.ThriftTest.newlib.binaryProtocol:
tags: newlib
thrift.ThriftTest.newlib.compactProtocol:
sample.thrift.hello.client.binaryProtocol:
platform_allow: mps2_an385 qemu_cortex_a53 qemu_x86_64 qemu_riscv32 qemu_riscv64_smp
integration_platforms:
- qemu_x86_64
sample.thrift.hello.client.compactProtocol:
extra_configs:
- CONFIG_THRIFT_COMPACT_PROTOCOL=y
tags: newlib
thrift.ThriftTest.newlib.zlibTransport:
platform_allow: mps2_an385 qemu_cortex_a53 qemu_x86_64 qemu_riscv32 qemu_riscv64_smp
integration_platforms:
- qemu_x86_64
sample.thrift.hello.client.zlibTransport:
extra_configs:
- CONFIG_THRIFT_ZLIB_TRANSPORT=y
tags: newlib
thrift.ThriftTest.newlib.tlsTransport:
platform_allow: mps2_an385 qemu_cortex_a53 qemu_x86_64 qemu_riscv32 qemu_riscv64_smp
integration_platforms:
- qemu_x86_64
sample.thrift.hello.client.tlsTransport:
extra_args: OVERLAY_CONFIG="../hello_common/overlay-tls.conf"
tags: newlib
# thrift.hello.native:
# arch_allow: posix
# tags: native
platform_allow: mps2_an385 qemu_cortex_a53 qemu_x86_64 qemu_riscv32 qemu_riscv64_smp
integration_platforms:
- qemu_x86_64

0 comments on commit 7be189f

Please sign in to comment.