ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 156 deletions

diff --git a/zephyr/test/hooks/hooks.c b/zephyr/test/hooks/hooks.c
deleted file mode 100644
index a9e0982e46..0000000000
--- a/zephyr/test/hooks/hooks.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <stdbool.h>
-#include <ztest.h>
-
-#include "hooks.h"
-
-static bool h1_called;
-static bool h2_called;
-static bool h3_called;
-
-static void h1(void)
-{
-	zassert_false(h1_called, "h1 was called, but should not have been");
-	zassert_false(h2_called, "h2 was called, but should not have been");
-	zassert_false(h3_called, "h3 was called, but should not have been");
-	h1_called = true;
-}
-DECLARE_HOOK(HOOK_TEST_1, h1, HOOK_PRIO_FIRST);
-
-static void h2(void)
-{
-	zassert_true(h1_called, "h1 was not called, but should have been");
-	zassert_false(h2_called, "h2 was called, but should not have been");
-	zassert_false(h3_called, "h3 was called, but should not have been");
-	h2_called = true;
-}
-DECLARE_HOOK(HOOK_TEST_1, h2, HOOK_PRIO_DEFAULT);
-
-static void h3(void)
-{
-	zassert_true(h1_called, "h1 was not called, but should have been");
-	zassert_true(h2_called, "h2 was not called, but should have been");
-	zassert_false(h3_called, "h3 was called, but should not have been");
-	h3_called = true;
-}
-DECLARE_HOOK(HOOK_TEST_1, h3, HOOK_PRIO_LAST);
-
-static void test_hook_list_multiple(void)
-{
-	hook_notify(HOOK_TEST_1);
-	zassert_true(h1_called, "h1 was not called, but should have been");
-	zassert_true(h2_called, "h2 was not called, but should have been");
-	zassert_true(h3_called, "h3 was not called, but should have been");
-}
-
-static bool h4_called;
-
-static void h4(void)
-{
-	zassert_false(h4_called, "h4 was called, but should not have been");
-	h4_called = true;
-}
-DECLARE_HOOK(HOOK_TEST_2, h4, HOOK_PRIO_DEFAULT);
-
-static void test_hook_list_single(void)
-{
-	hook_notify(HOOK_TEST_2);
-	zassert_true(h4_called, "h4 was not called, but should have been");
-}
-
-static void test_hook_list_empty(void)
-{
-	hook_notify(HOOK_TEST_3);
-}
-
-static bool deferred_func_called;
-
-#define DEFERRED_DELAY_US (500 * 1000)
-static void deferred_func(void)
-{
-	deferred_func_called = true;
-}
-DECLARE_DEFERRED(deferred_func);
-
-static void test_deferred_func(void)
-{
-	zassert_false(
-		deferred_func_called,
-		"The deferred function was called, but should not have been");
-	hook_call_deferred(&deferred_func_data, DEFERRED_DELAY_US);
-	zassert_false(
-		deferred_func_called,
-		"The deferred function was called, but should not have been");
-	k_usleep(DEFERRED_DELAY_US * 2);
-	zassert_true(
-		deferred_func_called,
-		"The deferred function was not called, but should have been");
-}
-
-static bool deferred_func_2_called;
-
-static void deferred_func_2(void)
-{
-	deferred_func_2_called = true;
-}
-DECLARE_DEFERRED(deferred_func_2);
-
-/*
- * Test that repeated calls to hook_call_deferred result in the
- * function being pushed out.
- */
-static void test_deferred_func_push_out(void)
-{
-	zassert_false(
-		deferred_func_2_called,
-		"The deferred function was called, but should not have been");
-	hook_call_deferred(&deferred_func_2_data, DEFERRED_DELAY_US);
-	hook_call_deferred(&deferred_func_2_data, DEFERRED_DELAY_US * 3);
-	k_usleep(DEFERRED_DELAY_US * 2);
-	zassert_false(
-		deferred_func_2_called,
-		"The deferred function was called, but should not have been");
-	k_usleep(DEFERRED_DELAY_US * 2);
-	zassert_true(
-		deferred_func_called,
-		"The deferred function was not called, but should have been");
-}
-
-static bool deferred_func_3_called;
-
-static void deferred_func_3(void)
-{
-	deferred_func_3_called = true;
-}
-DECLARE_DEFERRED(deferred_func_3);
-
-static void test_deferred_func_cancel(void)
-{
-	zassert_false(
-		deferred_func_3_called,
-		"The deferred function was called, but should not have been");
-	hook_call_deferred(&deferred_func_3_data, DEFERRED_DELAY_US);
-	hook_call_deferred(&deferred_func_3_data, -1);
-	k_usleep(DEFERRED_DELAY_US * 2);
-	zassert_false(
-		deferred_func_3_called,
-		"The deferred function was called, but should not have been");
-}
-
-void test_main(void)
-{
-	ztest_test_suite(
-		hooks_tests,
-		ztest_unit_test(test_hook_list_multiple),
-		ztest_unit_test(test_hook_list_single),
-		ztest_unit_test(test_hook_list_empty),
-		ztest_unit_test(test_deferred_func),
-		ztest_unit_test(test_deferred_func_push_out),
-		ztest_unit_test(test_deferred_func_cancel));
-
-	ztest_run_test_suite(hooks_tests);
-}