From 18eed82273f030823cc06dfde2cefee4e351d711 Mon Sep 17 00:00:00 2001
From: Yuval Peress <peress@google.com>
Date: Tue, 11 Apr 2023 22:37:09 -0600
Subject: [PATCH] cpp: Add rtio headers to cxx test

Include all the rtio headers with all the configs enabled into the
cxx test.

Signed-off-by: Yuval Peress <peress@google.com>
---
 tests/lib/cpp/cxx/prj.conf     | 6 ++++++
 tests/lib/cpp/cxx/src/main.cpp | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/tests/lib/cpp/cxx/prj.conf b/tests/lib/cpp/cxx/prj.conf
index 76420fd7ca2..3e4cfd717d8 100644
--- a/tests/lib/cpp/cxx/prj.conf
+++ b/tests/lib/cpp/cxx/prj.conf
@@ -5,3 +5,9 @@ CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=128
 CONFIG_ZTEST_NEW_API=y
 CONFIG_CRC=y
+
+# RTIO
+CONFIG_RTIO=y
+CONFIG_RTIO_SUBMIT_SEM=y
+CONFIG_RTIO_CONSUME_SEM=y
+CONFIG_RTIO_SYS_MEM_BLOCKS=y
diff --git a/tests/lib/cpp/cxx/src/main.cpp b/tests/lib/cpp/cxx/src/main.cpp
index 6428fe59e3d..0f9447337d3 100644
--- a/tests/lib/cpp/cxx/src/main.cpp
+++ b/tests/lib/cpp/cxx/src/main.cpp
@@ -79,6 +79,13 @@
 #include <zephyr/drivers/video.h>
 #include <zephyr/drivers/watchdog.h>
 
+/* Add RTIO headers to make sure they're CXX compatible */
+#include <zephyr/rtio/rtio.h>
+#include <zephyr/rtio/rtio_spsc.h>
+#include <zephyr/rtio/rtio_mpsc.h>
+#include <zephyr/rtio/rtio_executor_simple.h>
+#include <zephyr/rtio/rtio_executor_concurrent.h>
+
 #include <zephyr/ztest.h>
 
 class foo_class {