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

diff --git a/test/fan.c b/test/fan.c
deleted file mode 100644
index d03aa0213c..0000000000
--- a/test/fan.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2014 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 thermal engine.
- */
-
-#include "common.h"
-#include "console.h"
-#include "fan.h"
-#include "hooks.h"
-#include "host_command.h"
-#include "printf.h"
-#include "temp_sensor.h"
-#include "test_util.h"
-#include "thermal.h"
-#include "timer.h"
-#include "util.h"
-
-#define FAN_RPM(fan)	fans[fan].rpm
-
-/*****************************************************************************/
-/* Tests */
-
-void set_thermal_control_enabled(int fan, int enable);
-
-static int test_fan(void)
-{
-	/* "actual" fan speed from board/host/fan.c */
-	extern int mock_rpm;
-
-	sleep(2);
-
-	/* Fans initialize disabled. */
-	TEST_ASSERT(fan_get_rpm_actual(0) == 0);
-
-	set_thermal_control_enabled(0, 1);
-
-	/*
-	 * fan_set_percent_needed() is normally called once a second by the
-	 * thermal task, but we're not using a thermal test in this test so
-	 * we can dink around with the fans without having to wait. The host
-	 * implementation just sets mock_rpm to whatever it's asked for.
-	 */
-
-	/* Off */
-	fan_set_percent_needed(0, 0);
-	TEST_ASSERT(fan_get_rpm_actual(0) == 0);
-	fan_set_percent_needed(0, 0);
-	TEST_ASSERT(fan_get_rpm_actual(0) == 0);
-
-	/* On, but just barely */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_start);
-	/* fan is above min speed now, so should be set to min */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-
-	/* Full speed */
-	fan_set_percent_needed(0, 100);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_max);
-	fan_set_percent_needed(0, 100);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_max);
-
-	/* Slow again */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-
-	/* Off */
-	fan_set_percent_needed(0, 0);
-	TEST_ASSERT(fan_get_rpm_actual(0) == 0);
-	fan_set_percent_needed(0, 0);
-	TEST_ASSERT(fan_get_rpm_actual(0) == 0);
-
-	/* On, but just barely */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_start);
-	/* Force the mock_rpm to be slow, to simulate dragging */
-	mock_rpm = FAN_RPM(0)->rpm_min - 105;
-	/* It should keep trying for the start speed */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_start);
-	/* But we have to keep forcing the mock_rpm back down */
-	mock_rpm = FAN_RPM(0)->rpm_min - 105;
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_start);
-	/* Now let it turn just under rpm_min. Should be okay there. */
-	mock_rpm = FAN_RPM(0)->rpm_min - 10;
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-	/* Let it go a little faster, still okay */
-	mock_rpm = FAN_RPM(0)->rpm_min + 10;
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-	/* But if it drops too low, it should go back to the start speed */
-	mock_rpm = FAN_RPM(0)->rpm_min - 105;
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_start);
-	/* And then relax */
-	fan_set_percent_needed(0, 1);
-	TEST_ASSERT(fan_get_rpm_actual(0) == FAN_RPM(0)->rpm_min);
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	RUN_TEST(test_fan);
-
-	test_print_result();
-}