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

diff --git a/zephyr/zmake/tests/test_zmake.py b/zephyr/zmake/tests/test_zmake.py
deleted file mode 100644
index 641f9f3db9..0000000000
--- a/zephyr/zmake/tests/test_zmake.py
+++ /dev/null
@@ -1,224 +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.
-
-"""Do a run of 'zmake build' and check the output"""
-
-import logging
-import os
-import pathlib
-import re
-import tempfile
-import unittest
-import unittest.mock as mock
-from unittest.mock import patch
-
-from testfixtures import LogCapture
-
-import zmake.build_config
-import zmake.jobserver
-import zmake.multiproc as multiproc
-import zmake.project
-import zmake.toolchains
-import zmake.zmake as zm
-
-OUR_PATH = os.path.dirname(os.path.realpath(__file__))
-
-
-class FakeProject:
-    """A fake project which requests two builds and does no packing"""
-
-    # pylint: disable=too-few-public-methods
-
-    def __init__(self):
-        self.packer = mock.Mock()
-        self.packer.pack_firmware = mock.Mock(return_value=[])
-        self.project_dir = pathlib.Path("FakeProjectDir")
-
-        self.config = mock.Mock()
-        self.config.supported_zephyr_versions = [(2, 5)]
-
-    @staticmethod
-    def iter_builds():
-        """Yield the two builds that zmake normally does"""
-        yield "build-ro", zmake.build_config.BuildConfig()
-        yield "build-rw", zmake.build_config.BuildConfig()
-
-    def prune_modules(self, paths):
-        return {}  # pathlib.Path('path')]
-
-    def find_dts_overlays(self, module_paths):
-        return zmake.build_config.BuildConfig()
-
-    def get_toolchain(self, module_paths, override=None):
-        return zmake.toolchains.GenericToolchain(
-            override or "foo",
-            modules=module_paths,
-        )
-
-
-class FakeJobserver(zmake.jobserver.GNUMakeJobServer):
-    """A fake jobserver which just runs 'cat' on the provided files"""
-
-    def __init__(self, fnames):
-        """Start up a jobserver with two jobs
-
-        Args:
-            fnames: Dict of regexp to filename. If the regexp matches the
-            command, then the filename will be returned as the output.
-        """
-        super().__init__()
-        self.jobserver = zmake.jobserver.GNUMakeJobServer(jobs=2)
-        self.fnames = fnames
-
-    def get_job(self):
-        """Fake implementation of get_job(), which returns a real JobHandle()"""
-        return zmake.jobserver.JobHandle(mock.Mock())
-
-    # pylint: disable=arguments-differ
-    def popen(self, cmd, *args, **kwargs):
-        """Ignores the provided command and just runs 'cat' instead"""
-        for pattern, filename in self.fnames.items():
-            # Convert to a list of strings
-            cmd = [isinstance(c, pathlib.PosixPath) and c.as_posix() or c for c in cmd]
-            if pattern.match(" ".join(cmd)):
-                new_cmd = ["cat", filename]
-                break
-        else:
-            raise Exception('No pattern matched "%s"' % " ".join(cmd))
-        kwargs.pop("env", None)
-        return self.jobserver.popen(new_cmd, *args, **kwargs)
-
-
-def get_test_filepath(suffix):
-    """Get the filepath for a particular test file
-
-    Args:
-        suffix: Suffix of the file to read, e.g. 'ro' or 'ro_INFO'
-
-    Returns:
-        Full path to the test file
-    """
-    return os.path.join(OUR_PATH, "files", "sample_{}.txt".format(suffix))
-
-
-def do_test_with_log_level(log_level, use_configure=False, fnames=None):
-    """Test filtering using a particular log level
-
-    Args:
-        log_level: Level to use
-        use_configure: Run the 'configure' subcommand instead of 'build'
-        fnames: Dict of regexp to filename. If the regexp matches the
-            command, then the filename will be returned as the output.
-            (None to use default ro/rw output)
-
-    Returns:
-        tuple:
-            - List of log strings obtained from the run
-            - Temporary directory used for build
-    """
-    if fnames is None:
-        fnames = {
-            re.compile(r".*build-ro"): get_test_filepath("ro"),
-            re.compile(r".*build-rw"): get_test_filepath("rw"),
-        }
-    zephyr_base = mock.Mock()
-
-    zmk = zm.Zmake(
-        jobserver=FakeJobserver(fnames),
-        zephyr_base=zephyr_base,
-    )
-
-    with LogCapture(level=log_level) as cap:
-        with tempfile.TemporaryDirectory() as tmpname:
-            with open(os.path.join(tmpname, "VERSION"), "w") as fd:
-                fd.write(
-                    """VERSION_MAJOR = 2
-VERSION_MINOR = 5
-PATCHLEVEL = 0
-VERSION_TWEAK = 0
-EXTRAVERSION =
-"""
-                )
-            zephyr_base.resolve = mock.Mock(return_value=pathlib.Path(tmpname))
-            with patch("zmake.version.get_version_string", return_value="123"):
-                with patch.object(zmake.project, "Project", return_value=FakeProject()):
-                    if use_configure:
-                        zmk.configure(
-                            pathlib.Path(tmpname), build_dir=pathlib.Path("build")
-                        )
-                    else:
-                        with patch("zmake.version.write_version_header", autospec=True):
-                            zmk.build(pathlib.Path(tmpname))
-                    multiproc.wait_for_log_end()
-
-    recs = [rec.getMessage() for rec in cap.records]
-    return recs, tmpname
-
-
-class TestFilters(unittest.TestCase):
-    """Test filtering of stdout and stderr"""
-
-    def test_filter_normal(self):
-        """Test filtering of a normal build (with no errors)"""
-        recs, _ = do_test_with_log_level(logging.ERROR)
-        self.assertFalse(recs)
-
-    def test_filter_info(self):
-        """Test what appears on the INFO level"""
-        recs, tmpname = do_test_with_log_level(logging.INFO)
-        # TODO: Remove sets and figure out how to check the lines are in the
-        # right order.
-        expected = {
-            "Building {}:build-ro: /usr/bin/ninja -C {}/build-build-ro".format(
-                tmpname, tmpname
-            ),
-            "Building {}:build-rw: /usr/bin/ninja -C {}/build-build-rw".format(
-                tmpname, tmpname
-            ),
-        }
-        for suffix in ["ro", "rw"]:
-            with open(get_test_filepath("%s_INFO" % suffix)) as f:
-                for line in f:
-                    expected.add(
-                        "[{}:build-{}]{}".format(tmpname, suffix, line.strip())
-                    )
-        # This produces an easy-to-read diff if there is a difference
-        self.assertEqual(expected, set(recs))
-
-    def test_filter_debug(self):
-        """Test what appears on the DEBUG level"""
-        recs, tmpname = do_test_with_log_level(logging.DEBUG)
-        # TODO: Remove sets and figure out how to check the lines are in the
-        # right order.
-        expected = {
-            "Building {}:build-ro: /usr/bin/ninja -C {}/build-build-ro".format(
-                tmpname, tmpname
-            ),
-            "Building {}:build-rw: /usr/bin/ninja -C {}/build-build-rw".format(
-                tmpname, tmpname
-            ),
-            "Running cat {}/files/sample_ro.txt".format(OUR_PATH),
-            "Running cat {}/files/sample_rw.txt".format(OUR_PATH),
-        }
-        for suffix in ["ro", "rw"]:
-            with open(get_test_filepath(suffix)) as f:
-                for line in f:
-                    expected.add(
-                        "[{}:build-{}]{}".format(tmpname, suffix, line.strip())
-                    )
-        # This produces an easy-to-read diff if there is a difference
-        self.assertEqual(expected, set(recs))
-
-    def test_filter_devicetree_error(self):
-        """Test that devicetree errors appear"""
-        recs, tmpname = do_test_with_log_level(
-            logging.ERROR, True, {re.compile(r".*"): get_test_filepath("err")}
-        )
-
-        dt_errs = [rec for rec in recs if "adc" in rec]
-        assert "devicetree error: 'adc' is marked as required" in list(dt_errs)[0]
-
-
-if __name__ == "__main__":
-    unittest.main()