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

diff --git a/zephyr/zmake/tests/test_util.py b/zephyr/zmake/tests/test_util.py
deleted file mode 100644
index 0c4cd4dda5..0000000000
--- a/zephyr/zmake/tests/test_util.py
+++ /dev/null
@@ -1,107 +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.
-
-import pathlib
-import re
-import tempfile
-
-import hypothesis
-import hypothesis.strategies as st
-import pytest
-
-import zmake.util as util
-
-# Strategies for use with hypothesis
-relative_path = st.from_regex(
-    regex=re.compile(r"\A\w{1,255}(/\w{1,255}){0,15}\Z", re.ASCII)
-)
-
-
-@hypothesis.given(relative_path, relative_path, relative_path)
-@hypothesis.settings(deadline=60000)
-def test_resolve_build_dir_with_build_dir(
-    platform_ec_subdir, project_subdir, build_subdir
-):
-    with tempfile.TemporaryDirectory() as temp_dir_name:
-        platform_ec_dir = pathlib.Path(temp_dir_name) / platform_ec_subdir
-        build_dir = util.resolve_build_dir(
-            platform_ec_dir=platform_ec_dir,
-            project_dir=platform_ec_dir / project_subdir,
-            build_dir=platform_ec_dir / build_subdir,
-        )
-
-        assert build_dir == platform_ec_dir / build_subdir
-
-
-@hypothesis.given(relative_path, relative_path)
-@hypothesis.settings(deadline=60000)
-def test_resolve_build_dir_invalid_project(platform_ec_subdir, project_subdir):
-    try:
-        with tempfile.TemporaryDirectory() as temp_dir_name:
-            platform_ec_dir = pathlib.Path(temp_dir_name) / platform_ec_subdir
-            util.resolve_build_dir(
-                platform_ec_dir=platform_ec_dir,
-                project_dir=platform_ec_dir / project_subdir,
-                build_dir=None,
-            )
-            pytest.fail()
-    except Exception:
-        pass
-
-
-@hypothesis.given(relative_path, relative_path)
-@hypothesis.settings(deadline=60000)
-def test_resolve_build_dir_from_project(platform_ec_subdir, project_subdir):
-    with tempfile.TemporaryDirectory() as temp_dir_name:
-        platform_ec_dir = pathlib.Path(temp_dir_name) / platform_ec_subdir
-        project_dir = platform_ec_dir / project_subdir
-        project_dir.mkdir(parents=True)
-        (project_dir / "zmake.yaml").touch()
-        build_dir = util.resolve_build_dir(
-            platform_ec_dir=platform_ec_dir, project_dir=project_dir, build_dir=None
-        )
-        assert build_dir == platform_ec_dir / "build" / project_subdir
-
-
-version_integers = st.integers(min_value=0)
-version_tuples = st.tuples(version_integers, version_integers, version_integers)
-
-
-@hypothesis.given(version_tuples)
-@hypothesis.settings(deadline=60000)
-def test_read_zephyr_version(version_tuple):
-    with tempfile.TemporaryDirectory() as zephyr_base:
-        with open(pathlib.Path(zephyr_base) / "VERSION", "w") as f:
-            for name, value in zip(
-                ("VERSION_MAJOR", "VERSION_MINOR", "PATCHLEVEL"), version_tuple
-            ):
-                f.write("{} = {}\n".format(name, value))
-
-        assert util.read_zephyr_version(zephyr_base) == version_tuple
-
-
-@hypothesis.given(st.integers())
-@hypothesis.settings(deadline=60000)
-def test_read_kconfig_autoconf_value(value):
-    with tempfile.TemporaryDirectory() as dir:
-        path = pathlib.Path(dir)
-        with open(path / "autoconf.h", "w") as f:
-            f.write("#define TEST {}".format(value))
-        read_value = util.read_kconfig_autoconf_value(path, "TEST")
-        assert int(read_value) == value
-
-
-@pytest.mark.parametrize(
-    ["input_str", "expected_result"],
-    [
-        ("", '""'),
-        ("TROGDOR ABC-123", '"TROGDOR ABC-123"'),
-        ("hello world", '"hello world"'),
-        ("hello\nworld", r'"hello\nworld"'),
-        ('hello"world', r'"hello\"world"'),
-        ("hello\\world", '"hello\\\\world"'),
-    ],
-)
-def test_c_str(input_str, expected_result):
-    assert util.c_str(input_str) == expected_result