summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2022-02-24 09:14:35 -0700
committerCommit Bot <commit-bot@chromium.org>2022-02-25 00:40:55 +0000
commit8e85a57293d2c7517ebb0a15e2df732066816191 (patch)
tree0808a2610bcc6353ee9c9a62e0372a716da4d8ee
parent02e0147ca073cd7228be0509d0341cabb013e677 (diff)
downloadchrome-ec-8e85a57293d2c7517ebb0a15e2df732066816191.tar.gz
zmake: Remove coverage subcommand
There should be no uses and no documentation of the coverage subcommand. Remove it. BRANCH=None BUG=b:217788621 TEST=zmake test -a --coverage Change-Id: I515af49c1468ac8db1d66833a6763b1a93442b46 Signed-off-by: Jeremy Bettis <jbettis@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3488789 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
-rw-r--r--zephyr/zmake/README.md17
-rw-r--r--zephyr/zmake/zmake/__main__.py16
-rw-r--r--zephyr/zmake/zmake/zmake.py67
3 files changed, 0 insertions, 100 deletions
diff --git a/zephyr/zmake/README.md b/zephyr/zmake/README.md
index fb7d4b8414..95dd5d5433 100644
--- a/zephyr/zmake/README.md
+++ b/zephyr/zmake/README.md
@@ -137,23 +137,6 @@ Chromium OS's meta-build tool for Zephyr
| `--clobber` | Delete existing build directories, even if configuration is unchanged |
| `-B BUILD_DIR`, `--build-dir BUILD_DIR` | Build directory |
-### zmake coverage
-
-**Usage:** `zmake coverage [-h] [--clobber] build_dir`
-
-#### Positional Arguments
-
-| | |
-|---|---|
-| `build_dir` | The build directory used during configuration |
-
-#### Optional Arguments
-
-| | |
-|---|---|
-| `-h`, `--help` | show this help message and exit |
-| `--clobber` | Delete existing build directories, even if configuration is unchanged |
-
### zmake generate-readme
**Usage:** `zmake generate-readme [-h] [-o OUTPUT_FILE] [--diff]`
diff --git a/zephyr/zmake/zmake/__main__.py b/zephyr/zmake/zmake/__main__.py
index c39a645a81..c438560a3e 100644
--- a/zephyr/zmake/zmake/__main__.py
+++ b/zephyr/zmake/zmake/__main__.py
@@ -243,22 +243,6 @@ def get_argparser():
)
testall.add_argument("-B", "--build-dir", type=pathlib.Path, help="Build directory")
- coverage = sub.add_parser(
- "coverage",
- help="Run coverage on a build directory",
- )
- coverage.add_argument(
- "--clobber",
- action="store_true",
- dest="clobber",
- help="Delete existing build directories, even if configuration is unchanged",
- )
- coverage.add_argument(
- "build_dir",
- type=pathlib.Path,
- help="The build directory used during configuration",
- )
-
generate_readme = sub.add_parser(
"generate-readme",
help="Update the auto-generated markdown documentation",
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py
index 50ca5680ef..70143f4775 100644
--- a/zephyr/zmake/zmake/zmake.py
+++ b/zephyr/zmake/zmake/zmake.py
@@ -878,73 +878,6 @@ class Zmake:
raise OSError(get_process_failure_msg(proc))
return 0
- def coverage(self, build_dir, clobber=False):
- """Builds all targets with coverage enabled, and then runs the tests."""
- root_dir = self.module_paths["ec"] / "zephyr"
- projects = [
- p
- for p in zmake.project.find_projects(root_dir).values()
- if p.config.is_test
- ]
- for project in projects:
- project_build_dir = pathlib.Path(build_dir) / project.config.project_name
- # Configure and run the test.
- self.executor.append(
- func=functools.partial(
- self._configure,
- project=project,
- build_dir=project_build_dir,
- build_after_configure=True,
- test_after_configure=True,
- coverage=True,
- clobber=clobber,
- )
- )
- if self._sequential:
- rv = self.executor.wait()
- if rv:
- return rv
-
- rv = self.executor.wait()
- if rv:
- return rv
-
- self._merge_lcov_files(projects, build_dir, build_dir / "lcov.info")
- with self.jobserver.get_job():
- # Find the common root dir
- prefixdir = os.path.commonprefix(list(self.module_paths.values()))
-
- # Merge into a nice html report
- self.logger.info("Creating coverage report %s.", build_dir / "coverage_rpt")
- proc = self.jobserver.popen(
- [
- "/usr/bin/genhtml",
- "-q",
- "-o",
- build_dir / "coverage_rpt",
- "-t",
- "Zephyr EC Unittest",
- "-p",
- prefixdir,
- "-s",
- "--branch-coverage",
- build_dir / "lcov.info",
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- encoding="utf-8",
- errors="replace",
- )
- zmake.multiproc.log_output(
- self.logger, logging.ERROR, proc.stderr, job_id="genhtml"
- )
- zmake.multiproc.log_output(
- self.logger, logging.DEBUG, proc.stdout, job_id="genhtml"
- )
- if proc.wait():
- raise OSError(get_process_failure_msg(proc))
- return 0
-
def list_projects(self, format, search_dir):
"""List project names known to zmake on stdout.