testing: add system tests for zephyr with configuration fixes

Signed-off-by: SorinO <sorin.olari2@gmail.com>

Author: SorinOlari

tests/system/container.c

@@ -27,7 +27,7 @@ void setUp(void)
 	};
 
 	ocre_initialize(NULL);
-	context = ocre_create_context("./ocre/src/ocre/var/lib/ocre");
+	context = ocre_create_context(NULL);
 
 	hello_world = ocre_context_create_container(context, "hello-world.wasm", "wamr/wasip1", "hello", false, NULL);
 	blinky = ocre_context_create_container(context, "blinky.wasm", "wamr/wasip1", NULL, true, &args);

tests/system/context.c

@@ -15,7 +15,7 @@ struct ocre_context *context;
 void setUp(void)
 {
 	ocre_initialize(NULL);
-	context = ocre_create_context("./ocre/src/ocre/var/lib/ocre");
+	context = ocre_create_context(NULL);
 }
 
 void tearDown(void)

tests/system/posix/CMakeLists.txt

@@ -53,7 +53,7 @@ foreach(test ${OCRE_TESTS})
 
     add_custom_command(
         OUTPUT test_${test}.log
-        COMMAND LLVM_PROFILE_FILE=test_${test}.profraw ./test_${test} > test_${test}.log
+        COMMAND cd ocre && LLVM_PROFILE_FILE=../test_${test}.profraw ../test_${test} > ../test_${test}.log
         COMMAND rm -f test_${test}.testpass test_${test}.testfail
         COMMAND sh -c "[ \"$(tail -1 test_${test}.log)\" = \"OK\" ] && cp test_${test}.log test_${test}.testpass || cp test_${test}.log test_${test}.testfail"
         DEPENDS

tests/system/zephyr/container/CMakeLists.txt

@@ -0,0 +1,41 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_LIST_DIR}/../../../..)
+
+list(APPEND EXTRA_DTC_OVERLAY_FILE fstab.overlay)
+
+list(APPEND OCRE_SDK_PRELOADED_IMAGES
+    "return0.wasm"
+    "return1.wasm"
+    "sleep_5_return_0.wasm"
+    "hello-world.wasm"
+    "blinky.wasm"
+)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project (ocre_system_test_container)
+
+add_library(Unity STATIC
+    ../../../../tests/Unity/src/unity.c
+)
+
+target_include_directories(Unity PUBLIC
+    ../../../../tests/Unity/src
+)
+
+target_sources(app
+    PRIVATE
+    ../../container.c
+)
+
+target_link_libraries(app
+    PUBLIC
+    OcreCore
+    Unity
+)

tests/system/zephyr/container/boards/native_sim_64.conf

@@ -0,0 +1,6 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=10485760

tests/system/zephyr/container/boards/native_sim_64.overlay

@@ -0,0 +1,14 @@
+/**
+ * @copyright Copyright (c) contributors to Project Ocre,
+ * which has been established as Project Ocre a Series of LF Projects, LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&flash0 {
+    reg = < 0x0 DT_SIZE_M(32) >;
+};
+
+&storage_partition {
+    reg = < 0xfc000 DT_SIZE_M(16) >;
+};

tests/system/zephyr/container/fstab.overlay

@@ -0,0 +1,23 @@
+/**
+ * @copyright Copyright (c) contributors to Project Ocre,
+ * which has been established as Project Ocre a Series of LF Projects, LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	fstab {
+		compatible = "zephyr,fstab";
+		lfs1: lfs1 {
+			compatible = "zephyr,fstab,littlefs";
+			read-size = <256>;
+			prog-size = <256>;
+			cache-size = <256>;
+			lookahead-size = <256>;
+			block-cycles = <512>;
+			partition = <&storage_partition>;
+			mount-point = "/lfs";
+			automount;
+		};
+	};
+};

tests/system/zephyr/container/prj.conf

@@ -0,0 +1,25 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Logging
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+
+# Filesystem
+CONFIG_ZVFS_POLL_MAX=10
+CONFIG_ZVFS_OPEN_MAX=10
+
+# Memory options
+CONFIG_DYNAMIC_THREAD_STACK_SIZE=8192
+CONFIG_MAIN_STACK_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
+
+# pthreads
+CONFIG_MAX_PTHREAD_MUTEX_COUNT=8
+CONFIG_POSIX_THREAD_THREADS_MAX=8
+
+# Ocre configuration
+CONFIG_OCRE=y
+CONFIG_OCRE_TIMER=y

tests/system/zephyr/context/CMakeLists.txt

@@ -0,0 +1,42 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_LIST_DIR}/../../../..)
+
+list(APPEND EXTRA_DTC_OVERLAY_FILE fstab.overlay)
+
+list(APPEND OCRE_SDK_PRELOADED_IMAGES
+    "return0.wasm"
+    "return1.wasm"
+    "sleep_5_return_0.wasm"
+    "hello-world.wasm"
+    "filesystem.wasm"
+    "blinky.wasm"
+)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project (ocre_system_test_context)
+
+add_library(Unity STATIC
+    ../../../../tests/Unity/src/unity.c
+)
+
+target_include_directories(Unity PUBLIC
+    ../../../../tests/Unity/src
+)
+
+target_sources(app
+    PRIVATE
+    ../../context.c
+)
+
+target_link_libraries(app
+    PUBLIC
+    OcreCore
+    Unity
+)

tests/system/zephyr/context/boards/native_sim_64.conf

@@ -0,0 +1,6 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=10485760