summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Massey <aaronmassey@google.com>2022-09-21 16:54:38 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-23 15:49:28 +0000
commit01b263db812bd2efe6606985930c6d62aeef83a8 (patch)
tree217ed8f014ce9565b11e19bc7ee345f1ac9f851a
parentad07dbeda2102fa47feb4b44b3881cf5d7886a21 (diff)
downloadchrome-ec-01b263db812bd2efe6606985930c6d62aeef83a8.tar.gz
test: system_get_sku_id() calls board_get_sku_id()
Verify that system_get_sku_id() returns a sku id provided by a board-provided function when CONFIG_HOST_CMD_AP_SET_SKUID is not enabled. BRANCH=none BUG=b:248106876 TEST=./twister --clobber -i -s zephyr/test/drivers/drivers.system Signed-off-by: Aaron Massey <aaronmassey@google.com> Change-Id: Ic4aee4bf51c351ebf43b8df95a2e27dd75d4eb96 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3911313 Reviewed-by: Yuval Peress <peress@google.com> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
-rw-r--r--zephyr/test/drivers/system/CMakeLists.txt3
-rw-r--r--zephyr/test/drivers/system/src/system.c13
-rw-r--r--zephyr/test/drivers/system/src/system_not_board_ap_set_sku_id.c18
3 files changed, 26 insertions, 8 deletions
diff --git a/zephyr/test/drivers/system/CMakeLists.txt b/zephyr/test/drivers/system/CMakeLists.txt
index 1e59f8fba9..e41696bca3 100644
--- a/zephyr/test/drivers/system/CMakeLists.txt
+++ b/zephyr/test/drivers/system/CMakeLists.txt
@@ -4,3 +4,6 @@
# Add source files
target_sources(app PRIVATE src/system.c)
+
+target_sources_ifndef(CONFIG_HOST_CMD_AP_SET_SKUID app PRIVATE
+src/system_not_board_ap_set_sku_id.c)
diff --git a/zephyr/test/drivers/system/src/system.c b/zephyr/test/drivers/system/src/system.c
index 01956d8721..f0db0be170 100644
--- a/zephyr/test/drivers/system/src/system.c
+++ b/zephyr/test/drivers/system/src/system.c
@@ -46,13 +46,13 @@ ZTEST_USER(system, test_hostcmd_board_version)
/* System Function Testing */
-static void system_flags_before_after(void *data)
+static void system_before_after(void *data)
{
ARG_UNUSED(data);
system_clear_reset_flags(-1);
}
-ZTEST(system_save_flags, test_system_encode_save_flags)
+ZTEST(system, test_system_encode_save_flags)
{
int flags_to_save = 0;
uint32_t saved_flags = 0;
@@ -73,8 +73,7 @@ ZTEST(system_save_flags, test_system_encode_save_flags)
zassert_not_equal(0, saved_flags & EC_RESET_FLAG_AP_WATCHDOG, NULL);
}
-ZTEST(system_save_flags,
- test_system_encode_save_flags_mutually_exclusive_reset_flags)
+ZTEST(system, test_system_encode_save_flags_mutually_exclusive_reset_flags)
{
int flags_to_save = 0;
uint32_t saved_flags = 0;
@@ -107,7 +106,5 @@ ZTEST(system_save_flags,
zassert_not_equal(0, saved_flags & EC_RESET_FLAG_SOFT, NULL);
}
-ZTEST_SUITE(system, drivers_predicate_post_main, NULL, NULL, NULL, NULL);
-
-ZTEST_SUITE(system_save_flags, drivers_predicate_post_main, NULL,
- system_flags_before_after, system_flags_before_after, NULL);
+ZTEST_SUITE(system, drivers_predicate_post_main, NULL, system_before_after,
+ system_before_after, NULL);
diff --git a/zephyr/test/drivers/system/src/system_not_board_ap_set_sku_id.c b/zephyr/test/drivers/system/src/system_not_board_ap_set_sku_id.c
new file mode 100644
index 0000000000..8f71531bb8
--- /dev/null
+++ b/zephyr/test/drivers/system/src/system_not_board_ap_set_sku_id.c
@@ -0,0 +1,18 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+#include "system.h"
+
+/* Tests for !CONFIG_HOST_CMD_AP_SET_SKUID */
+
+#define DEFAULT_BOARD_PROVIDED_SKU_ID 0
+
+ZTEST(system, test_system_get_sku_id_default_board_provided_value)
+{
+ zassert_equal(system_get_sku_id(), DEFAULT_BOARD_PROVIDED_SKU_ID);
+}