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

diff --git a/test/usb_pd_int.c b/test/usb_pd_int.c
deleted file mode 100644
index 5d3cbbf0f2..0000000000
--- a/test/usb_pd_int.c
+++ /dev/null
@@ -1,112 +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-PD interrupt task.
- */
-#include "task.h"
-#include "test_util.h"
-#include "mock/tcpc_mock.h"
-#include "mock/timer_mock.h"
-#include "mock/usb_mux_mock.h"
-
-#define PORT0 0
-
-/* Install Mock TCPC and MUX drivers */
-const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
-	{
-		.drv = &mock_tcpc_driver,
-	},
-};
-
-const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
-	{
-		.driver = &mock_usb_mux_driver,
-	}
-};
-
-void board_reset_pd_mcu(void)
-{
-}
-
-static int deferred_resume_called;
-void pd_deferred_resume(int port)
-{
-		deferred_resume_called = 1;
-}
-
-static int num_events;
-uint16_t tcpc_get_alert_status(void)
-{
-		if (--num_events > 0)
-			return PD_STATUS_TCPC_ALERT_0;
-		else
-			return 0;
-}
-
-test_static int test_storm_not_triggered(void)
-{
-		num_events = 100;
-		deferred_resume_called = 0;
-		schedule_deferred_pd_interrupt(PORT0);
-		task_wait_event(SECOND);
-		TEST_EQ(deferred_resume_called, 0, "%d");
-
-		return EC_SUCCESS;
-}
-
-test_static int test_storm_triggered(void)
-{
-		num_events = 1000;
-		deferred_resume_called = 0;
-		schedule_deferred_pd_interrupt(PORT0);
-		task_wait_event(SECOND);
-		TEST_EQ(deferred_resume_called, 1, "%d");
-
-		return EC_SUCCESS;
-}
-
-test_static int test_storm_not_triggered_for_32bit_overflow(void)
-{
-		int i;
-		timestamp_t time;
-
-		/*
-		 * Ensure the MSB is 1 for overflow comparison tests.
-		 * But make sure not to move time backwards.
-		 */
-		time.val = (get_time().val + 0x100000000) | 0xff000000;
-		force_time(time);
-
-		/*
-		 * 100 events every second for 10 seconds should never trigger
-		 * a shutdown call.
-		 */
-		for (i = 0; i < 10; ++i) {
-			num_events = 100;
-			deferred_resume_called = 0;
-			schedule_deferred_pd_interrupt(PORT0);
-			task_wait_event(SECOND);
-
-			TEST_EQ(deferred_resume_called, 0, "%d");
-		}
-
-		return EC_SUCCESS;
-}
-
-void before_test(void)
-{
-		pd_set_suspend(PORT0, 0);
-}
-
-void run_test(int argc, char **argv)
-{
-	/* Let tasks settle down */
-	task_wait_event(MINUTE);
-
-	RUN_TEST(test_storm_not_triggered);
-	RUN_TEST(test_storm_triggered);
-	RUN_TEST(test_storm_not_triggered_for_32bit_overflow);
-
-	test_print_result();
-}