samples: modules: thrift: filter on CONFIG_FULL_LIBCPP_SUPPORTED

Change sample to set CONFIG_FULL_LIBCPP_REQUIRED and to filter on CONFIG_FULL_LIBCPP_SUPPORTED. Since not all toolchains provide a full libc++ this will restrict the sample only to those environments that do. Signed-off-by: Kumar Gala <[email protected]>
Tronil · May 4, 2023 · 0bae215 · 0bae215
1 parent 2b4fdd1
commit 0bae215
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/samples/modules/thrift/hello/client/prj.conf b/samples/modules/thrift/hello/client/prj.conf
@@ -1,12 +1,10 @@
 # CONFIG_LIB_CPLUSPLUS Dependencies
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_NANO=n
+CONFIG_REQUIRES_FULL_LIBCPP=y
 
 # CONFIG_THRIFT Dependencies
 CONFIG_CPP=y
 CONFIG_STD_CPP17=y
 CONFIG_CPP_EXCEPTIONS=y
-CONFIG_EXTERNAL_LIBCPP=y
 CONFIG_POSIX_API=y
 CONFIG_NETWORKING=y
 CONFIG_NET_SOCKETS=y

diff --git a/samples/modules/thrift/hello/client/sample.yaml b/samples/modules/thrift/hello/client/sample.yaml
@@ -7,6 +7,7 @@ common:
   modules:
     - thrift
   platform_allow: mps2_an385 qemu_x86_64
+  filter: CONFIG_FULL_LIBCPP_SUPPORTED
 tests:
   sample.thrift.hello.server.binaryProtocol: {}
   sample.thrift.hello.server.compactProtocol:

diff --git a/samples/modules/thrift/hello/server/prj.conf b/samples/modules/thrift/hello/server/prj.conf
@@ -1,12 +1,10 @@
 # Need a full libc++
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_NANO=n
+CONFIG_REQUIRES_FULL_LIBCPP=y
 
 # CONFIG_THRIFT Dependencies
 CONFIG_CPP=y
 CONFIG_STD_CPP17=y
 CONFIG_CPP_EXCEPTIONS=y
-CONFIG_EXTERNAL_LIBCPP=y
 CONFIG_POSIX_API=y
 CONFIG_NET_SOCKETPAIR=y
 CONFIG_HEAP_MEM_POOL_SIZE=16384

diff --git a/samples/modules/thrift/hello/server/sample.yaml b/samples/modules/thrift/hello/server/sample.yaml
@@ -7,6 +7,7 @@ common:
   modules:
     - thrift
   platform_allow: mps2_an385 qemu_x86_64
+  filter: CONFIG_FULL_LIBCPP_SUPPORTED
 tests:
   sample.thrift.hello.server.binaryProtocol: {}
   sample.thrift.hello.server.compactProtocol: