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

diff --git a/util/run_host_test b/util/run_host_test
deleted file mode 100755
index 15013d91b6..0000000000
--- a/util/run_host_test
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Copyright 2020 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.
-
-"""Wrapper that runs a host test. Handles timeout and stopping the emulator."""
-
-import argparse
-import enum
-import io
-import os
-import pathlib
-import select
-import subprocess
-import sys
-import time
-
-
-class TestResult(enum.Enum):
-  """An Enum representing the result of running a test."""
-  SUCCESS = 0
-  FAIL = 1
-  TIMEOUT = 2
-  UNEXPECTED_TERMINATION = 3
-
-  @property
-  def reason(self):
-    return {
-        TestResult.SUCCESS: 'passed',
-        TestResult.FAIL: 'failed',
-        TestResult.TIMEOUT: 'timed out',
-        TestResult.UNEXPECTED_TERMINATION: 'terminated unexpectedly',
-    }[self]
-
-
-def run_test(path, timeout=10):
-  start_time = time.monotonic()
-  env = dict(os.environ)
-  env['ASAN_OPTIONS'] = 'log_path=stderr'
-
-  proc = subprocess.Popen(
-      [path],
-      bufsize=0,
-      stdin=subprocess.PIPE,
-      stdout=subprocess.PIPE,
-      env=env,
-      encoding='utf-8',
-      errors='replace',
-  )
-
-  # Put the output pipe in non-blocking mode. We will then select(2)
-  # on the pipe to know when we have bytes to process.
-  os.set_blocking(proc.stdout.fileno(), False)
-
-  try:
-    output_buffer = io.StringIO()
-    while True:
-      select_timeout = timeout - (time.monotonic() - start_time)
-      if select_timeout <= 0:
-        return TestResult.TIMEOUT, output_buffer.getvalue()
-
-      readable, _, _ = select.select([proc.stdout], [], [], select_timeout)
-
-      if not readable:
-        # Indicates that select(2) timed out.
-        return TestResult.TIMEOUT, output_buffer.getvalue()
-
-      output_buffer.write(proc.stdout.read())
-      output_log = output_buffer.getvalue()
-
-      if 'Pass!' in output_log:
-        return TestResult.SUCCESS, output_log
-      if 'Fail!' in output_log:
-        return TestResult.FAIL, output_log
-      if proc.poll():
-        return TestResult.UNEXPECTED_TERMINATION, output_log
-  finally:
-    # Check if the process has exited. If not, send it a SIGTERM, wait for it
-    # to exit, and if it times out, kill the process directly.
-    if not proc.poll():
-      try:
-        proc.terminate()
-        proc.wait(timeout)
-      except subprocess.TimeoutExpired:
-        proc.kill()
-
-
-def parse_options(argv):
-  parser = argparse.ArgumentParser()
-  parser.add_argument('-t', '--timeout', type=float, default=60,
-                      help='Timeout to kill test after.')
-  parser.add_argument('--coverage', action='store_const', const='coverage',
-                      default='host', dest='test_target',
-                      help='Flag if this is a code coverage test.')
-  parser.add_argument('--verbose', '-v', action='store_true',
-                      help='Dump emulator output always, even if successful.')
-  parser.add_argument('test_name', type=str)
-  return parser.parse_args(argv)
-
-
-def main(argv):
-  opts = parse_options(argv)
-
-  # Tests will be located in build/host, unless the --coverage flag was
-  # provided, in which case they will be in build/coverage.
-  exec_path = pathlib.Path('build', opts.test_target, opts.test_name,
-                           f'{opts.test_name}.exe')
-  if not exec_path.is_file():
-    print(f'No test named {opts.test_name} exists!')
-    return 1
-
-  start_time = time.monotonic()
-  result, output = run_test(exec_path, timeout=opts.timeout)
-  elapsed_time = time.monotonic() - start_time
-
-  print('{} {}! ({:.3f} seconds)'.format(
-      opts.test_name, result.reason, elapsed_time),
-        file=sys.stderr)
-
-  if result is not TestResult.SUCCESS or opts.verbose:
-    print('====== Emulator output ======', file=sys.stderr)
-    print(output, file=sys.stderr)
-    print('=============================', file=sys.stderr)
-  return result.value
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))