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

diff --git a/test/version.c b/test/version.c
deleted file mode 100644
index ad7571d5f6..0000000000
--- a/test/version.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright 2021 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 ec version
- */
-
-#include "common.h"
-#include "ec_commands.h"
-#include "stddef.h"
-#include "system.h"
-#include "util.h"
-#include "test_util.h"
-
-/*
- * Tests that fw version adheres to the expected format.
- * Example fw version: host_v2.0.10135+b3e38e380c
- */
-static int test_version(void)
-{
-	const char *fw_version;
-	size_t board_name_length, major_version_length, minor_version_length,
-		sub_minor_version_length, hash_length;
-	const char *major_version_ptr, *minor_version_ptr,
-		*sub_minor_version_ptr, *hash_ptr;
-
-	fw_version = system_get_version(EC_IMAGE_RO);
-
-	TEST_ASSERT(fw_version != NULL);
-
-	ccprintf("fw_version: %s\n", fw_version);
-
-	TEST_LE(strlen(fw_version), (size_t)32, "%zu");
-
-	board_name_length = strcspn(fw_version, "_");
-
-	TEST_GE(board_name_length, (size_t)3, "%zu");
-
-	major_version_ptr = fw_version + board_name_length + 1;
-	major_version_length = strcspn(major_version_ptr, ".");
-
-	TEST_GE(major_version_length, (size_t)2, "%zu");
-	TEST_EQ(major_version_ptr[0], 'v', "%c");
-	for (int i = 1; i < major_version_length; i++)
-		TEST_ASSERT(isdigit(major_version_ptr[i]));
-
-	minor_version_ptr = major_version_ptr + major_version_length + 1;
-	minor_version_length = strcspn(minor_version_ptr, ".");
-
-	TEST_GE(minor_version_length, (size_t)1, "%zu");
-	for (int i = 0; i < minor_version_length; i++)
-		TEST_ASSERT(isdigit(minor_version_ptr[i]));
-
-	sub_minor_version_ptr = minor_version_ptr + minor_version_length + 1;
-	sub_minor_version_length = strcspn(sub_minor_version_ptr, "-+");
-
-	TEST_GE(sub_minor_version_length, (size_t)1, "%zu");
-	for (int i = 0; i < sub_minor_version_length; i++)
-		TEST_ASSERT(isdigit(sub_minor_version_ptr[i]));
-
-	hash_ptr = sub_minor_version_ptr + sub_minor_version_length + 1;
-	hash_length = strlen(hash_ptr);
-
-	TEST_GE(hash_length, (size_t)8, "%zu");
-	for (int i = 0; i < hash_length; i++)
-		TEST_ASSERT(isdigit(hash_ptr[i]) ||
-			    (hash_ptr[i] >= 'a' && hash_ptr[i] <= 'f'));
-
-	return EC_SUCCESS;
-}
-
-/*
- * Tests that cros fwid adheres to the expected format.
- * Example cros fwid: host_14175.0.21_08_24
- */
-static int test_fwid(void)
-{
-	const char *cros_fwid;
-	size_t board_name_length, major_version_length, minor_version_length,
-		sub_minor_version_length;
-	const char *major_version_ptr, *minor_version_ptr,
-		*sub_minor_version_ptr;
-
-	cros_fwid = system_get_cros_fwid(EC_IMAGE_RO);
-
-	TEST_ASSERT(cros_fwid != NULL);
-
-	ccprintf("cros_fwid: %s\n", cros_fwid);
-
-	TEST_LE(strlen(cros_fwid), (size_t)32, "%zu");
-
-	board_name_length = strcspn(cros_fwid, "_");
-	TEST_GE(board_name_length, (size_t)3, "%zu");
-
-	major_version_ptr = cros_fwid + board_name_length + 1;
-	major_version_length = strcspn(major_version_ptr, ".");
-	TEST_GE(major_version_length, (size_t)5, "%zu");
-
-	for (int i = 0; i < major_version_length; i++)
-		TEST_ASSERT(isdigit(major_version_ptr[i]));
-
-	minor_version_ptr = major_version_ptr + major_version_length + 1;
-	minor_version_length = strcspn(minor_version_ptr, ".");
-	TEST_GE(minor_version_length, (size_t)1, "%zu");
-
-	for (int i = 0; i < minor_version_length; i++)
-		TEST_ASSERT(isdigit(minor_version_ptr[i]));
-
-	sub_minor_version_ptr = minor_version_ptr + minor_version_length + 1;
-	sub_minor_version_length = strlen(sub_minor_version_ptr);
-	TEST_GE(sub_minor_version_length, (size_t)1, "%zu");
-
-	for (int i = 0; i < sub_minor_version_length; i++)
-		TEST_ASSERT(isdigit(sub_minor_version_ptr[i]) ||
-			    sub_minor_version_ptr[i] == '_');
-
-	return EC_SUCCESS;
-}
-
-/*
- * Tests requesting TEST.
- * Example fw version: host_v2.0.10135+b3e38e380c
- */
-static int test_image_unknown(void)
-{
-	const char *fw_version;
-	const char *cros_fwid;
-
-	fw_version = system_get_version(EC_IMAGE_UNKNOWN);
-
-	TEST_ASSERT(fw_version != NULL);
-	TEST_LE(strlen(fw_version), (size_t)32, "%zu");
-
-	cros_fwid = system_get_cros_fwid(EC_IMAGE_UNKNOWN);
-
-	TEST_ASSERT(cros_fwid != NULL);
-	TEST_LE(strlen(cros_fwid), (size_t)32, "%zu");
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	RUN_TEST(test_version);
-	RUN_TEST(test_fwid);
-	RUN_TEST(test_image_unknown);
-
-	test_print_result();
-}