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, 190 deletions

diff --git a/test/usb_sm_checks.c b/test/usb_sm_checks.c
deleted file mode 100644
index 03e5aa23c2..0000000000
--- a/test/usb_sm_checks.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright 2019 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.
- *
- * Test USB Type-C VPD and CTVPD module.
- */
-#include "common.h"
-#include "task.h"
-#include "test_util.h"
-#include "timer.h"
-#include "usb_pd.h"
-#include "usb_sm.h"
-#include "usb_tc_sm.h"
-#include "util.h"
-#include "usb_pd_test_util.h"
-#include "vpd_api.h"
-
-#ifdef CONFIG_USB_TYPEC_SM
-extern const struct test_sm_data test_tc_sm_data[];
-extern const int test_tc_sm_data_size;
-#else
-const struct test_sm_data test_tc_sm_data[] = {};
-const int test_tc_sm_data_size;
-#endif
-
-#ifdef CONFIG_USB_PRL_SM
-extern const struct test_sm_data test_prl_sm_data[];
-extern const int test_prl_sm_data_size;
-#else
-const struct test_sm_data test_prl_sm_data[] = {};
-const int test_prl_sm_data_size;
-#endif
-
-#ifdef CONFIG_USB_PE_SM
-extern const struct test_sm_data test_pe_sm_data[];
-extern const int test_pe_sm_data_size;
-#else
-const struct test_sm_data test_pe_sm_data[] = {};
-const int test_pe_sm_data_size;
-#endif
-
-test_static int test_no_parent_cycles(const struct test_sm_data * const sm_data)
-{
-	int i;
-
-	for (i = 0; i < sm_data->size; ++i) {
-		int depth = 0;
-		usb_state_ptr current = &sm_data->base[i];
-
-		while (current != NULL && ++depth <= sm_data->size)
-			current = current->parent;
-
-		if (depth > sm_data->size)
-			break;
-	}
-
-	/* Ensure all states end, otherwise the ith state has a cycle. */
-	TEST_EQ(i, sm_data->size, "%d");
-
-	return EC_SUCCESS;
-}
-
-int test_tc_no_parent_cycles(void)
-{
-	int i;
-
-	for (i = 0; i < test_tc_sm_data_size; ++i) {
-		const int rv = test_no_parent_cycles(&test_tc_sm_data[i]);
-
-		if (rv) {
-			ccprintf("TC State machine %d has a cycle!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-int test_prl_no_parent_cycles(void)
-{
-	int i;
-
-	for (i = 0; i < test_prl_sm_data_size; ++i) {
-		const int rv = test_no_parent_cycles(&test_prl_sm_data[i]);
-
-		if (rv) {
-			ccprintf("PRL State machine %d has a cycle!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-int test_pe_no_parent_cycles(void)
-{
-	int i;
-
-	for (i = 0; i < test_pe_sm_data_size; ++i) {
-		const int rv = test_no_parent_cycles(&test_pe_sm_data[i]);
-
-		if (rv) {
-			ccprintf("PE State machine %d has a cycle!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-static volatile int state_printed;
-
-/* Override the implement version of print */
-__override void print_current_state(const int port)
-{
-	state_printed = 1;
-}
-
-static int test_all_states_named(const struct test_sm_data * const sm_data)
-{
-	int i;
-
-	for (i = 0; i < sm_data->size; ++i) {
-		usb_state_ptr current = &sm_data->base[i];
-
-		state_printed = 0;
-
-		if (current->entry)
-			current->entry(0);
-
-		if (state_printed) {
-			if (i >= sm_data->names_size ||
-			    sm_data->names[i] == NULL) {
-				ccprintf("State %d does not have a name!\n", i);
-				TEST_ASSERT(0);
-			}
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-int test_tc_all_states_named(void)
-{
-	int i;
-
-	for (i = 0; i < test_tc_sm_data_size; ++i) {
-		const int rv = test_all_states_named(&test_tc_sm_data[i]);
-
-		if (rv) {
-			ccprintf("TC State machine %d has empty name!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-int test_prl_all_states_named(void)
-{
-	int i;
-
-	for (i = 0; i < test_prl_sm_data_size; ++i) {
-		const int rv = test_all_states_named(&test_prl_sm_data[i]);
-
-		if (rv) {
-			ccprintf("PRL State machine %d has empty name!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-int test_pe_all_states_named(void)
-{
-	int i;
-
-	for (i = 0; i < test_pe_sm_data_size; ++i) {
-		const int rv = test_all_states_named(&test_pe_sm_data[i]);
-
-		if (rv) {
-			ccprintf("PE State machine %d has empty name!\n", i);
-			TEST_ASSERT(0);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-