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

diff --git a/zephyr/zmake/tests/test_toolchains.py b/zephyr/zmake/tests/test_toolchains.py
deleted file mode 100644
index 515f54a112..0000000000
--- a/zephyr/zmake/tests/test_toolchains.py
+++ /dev/null
@@ -1,155 +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 os
-import pathlib
-
-import pytest
-
-import zmake.project as project
-import zmake.toolchains as toolchains
-
-
-@pytest.fixture
-def mockfs(monkeypatch, tmp_path):
-    """Setup a fake fs root for pathlib objects at tmp_path/mockfs."""
-    mockfs_dir = pathlib.PosixPath(tmp_path / "mockfs")
-    mockfs_dir.mkdir()
-
-    class FakePath(pathlib.Path):
-        def __new__(cls, *args, **kwargs):
-            parts = pathlib.PosixPath(*args).relative_to("/").parts
-            # Make sure we don't double up our mocked directory.
-            mock_dir_parts = mockfs_dir.relative_to("/").parts
-            if parts[: len(mock_dir_parts)] == mock_dir_parts:
-                return pathlib.PosixPath(*args)
-            return pathlib.PosixPath("/", *mock_dir_parts, *parts)
-
-    monkeypatch.setattr(pathlib, "Path", FakePath)
-    return mockfs_dir
-
-
-@pytest.fixture
-def coreboot_sdk_exists(mockfs):
-    coreboot_sdk_dir = mockfs / "opt" / "coreboot-sdk"
-    coreboot_sdk_dir.mkdir(parents=True)
-
-
-@pytest.fixture
-def llvm_exists(mockfs):
-    llvm_file = mockfs / "usr" / "bin" / "x86_64-pc-linux-gnu-clang"
-    llvm_file.parent.mkdir(parents=True)
-    llvm_file.write_text("")
-
-
-@pytest.fixture
-def host_toolchain_exists(mockfs, monkeypatch):
-    monkeypatch.setattr(os, "environ", {})
-
-    gcc_file = mockfs / "usr" / "bin" / "gcc"
-    gcc_file.parent.mkdir(parents=True)
-    gcc_file.write_text("")
-
-
-@pytest.fixture
-def zephyr_exists(mockfs):
-    zephyr_sdk_version_file = mockfs / "opt" / "zephyr-sdk" / "sdk_version"
-    zephyr_sdk_version_file.parent.mkdir(parents=True)
-    zephyr_sdk_version_file.write_text("")
-
-
-@pytest.fixture
-def fake_project(tmp_path):
-    return project.Project(
-        tmp_path,
-        config_dict={
-            "board": "foo",
-            "supported-zephyr-versions": ["v2.6"],
-            "supported-toolchains": [
-                "coreboot-sdk",
-                "host",
-                "llvm",
-                "zephyr",
-            ],
-            "output-type": "raw",
-        },
-    )
-
-
-module_paths = {
-    "ec": pathlib.Path("/mnt/host/source/src/platform/ec"),
-}
-
-
-def test_coreboot_sdk(fake_project, coreboot_sdk_exists):
-    tc = fake_project.get_toolchain(module_paths)
-    assert isinstance(tc, toolchains.CorebootSdkToolchain)
-
-    config = tc.get_build_config()
-    assert config.cmake_defs == {
-        "ZEPHYR_TOOLCHAIN_VARIANT": "coreboot-sdk",
-        "TOOLCHAIN_ROOT": "/mnt/host/source/src/platform/ec/zephyr",
-    }
-
-
-def test_llvm(fake_project, llvm_exists):
-    tc = fake_project.get_toolchain(module_paths)
-    assert isinstance(tc, toolchains.LlvmToolchain)
-
-    config = tc.get_build_config()
-    assert config.cmake_defs == {
-        "ZEPHYR_TOOLCHAIN_VARIANT": "llvm",
-        "TOOLCHAIN_ROOT": "/mnt/host/source/src/platform/ec/zephyr",
-    }
-
-
-def test_zephyr(fake_project, zephyr_exists):
-    tc = fake_project.get_toolchain(module_paths)
-    assert isinstance(tc, toolchains.ZephyrToolchain)
-
-    config = tc.get_build_config()
-    assert config.cmake_defs == {
-        "ZEPHYR_TOOLCHAIN_VARIANT": "zephyr",
-        "ZEPHYR_SDK_INSTALL_DIR": str(pathlib.Path("/opt/zephyr-sdk")),
-    }
-    assert config.environ_defs == {
-        "ZEPHYR_SDK_INSTALL_DIR": str(pathlib.Path("/opt/zephyr-sdk")),
-    }
-
-
-def test_zephyr_from_env(mockfs, monkeypatch, fake_project):
-    zephyr_sdk_path = mockfs / "zsdk"
-    zephyr_sdk_path.mkdir()
-
-    environ = {"ZEPHYR_SDK_INSTALL_DIR": str(zephyr_sdk_path)}
-    monkeypatch.setattr(os, "environ", environ)
-
-    tc = fake_project.get_toolchain(module_paths)
-    assert isinstance(tc, toolchains.ZephyrToolchain)
-
-    config = tc.get_build_config()
-    assert config.cmake_defs == {
-        "ZEPHYR_TOOLCHAIN_VARIANT": "zephyr",
-        "ZEPHYR_SDK_INSTALL_DIR": str(zephyr_sdk_path),
-    }
-    assert config.environ_defs == {
-        "ZEPHYR_SDK_INSTALL_DIR": str(zephyr_sdk_path),
-    }
-
-
-def test_host_toolchain(fake_project, host_toolchain_exists):
-    tc = fake_project.get_toolchain(module_paths)
-    assert isinstance(tc, toolchains.HostToolchain)
-
-    config = tc.get_build_config()
-    assert config.cmake_defs == {
-        "ZEPHYR_TOOLCHAIN_VARIANT": "host",
-    }
-
-
-def test_toolchain_override(mockfs, fake_project):
-    tc = fake_project.get_toolchain(module_paths, override="foo")
-    config = tc.get_build_config()
-    assert isinstance(tc, toolchains.GenericToolchain)
-    assert config.cmake_defs == {"ZEPHYR_TOOLCHAIN_VARIANT": "foo"}