diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-10-14 14:10:52 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-14 21:20:23 +0000 |
| commit | 434d9f7aabb678da45c07c2b8b2ed7bd9d911b34 (patch) | |
| tree | 4f946abe3023f5853622eaeb668e189222011edd | |
| parent | a162e77d1a3a29e0c5b676a6497ecbd664fb76b7 (diff) | |
| download | chrome-ec-434d9f7aabb678da45c07c2b8b2ed7bd9d911b34.tar.gz | |
ec: Replace dir in path with *
BRANCH=None
BUG=b:253647573
TEST=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I1f91b8123a2e44ea5a137f9644645ca1b4494aaa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3956204
Reviewed-by: Bobby Casey <bobbycasey@google.com>
Commit-Queue: Bobby Casey <bobbycasey@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | docs/code_coverage.md | 2 | ||||
| -rwxr-xr-x | zephyr/firmware_builder.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd31410ca0..acdba815ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,7 +171,7 @@ before_script: "${EC_DIR}/test/**" "${EC_DIR}/include/tests/**" "${EC_DIR}/private/test/**" - "${EC_DIR}/private/fingerprint/google-fpalg/mcutest/**" + "${EC_DIR}/private/fingerprint/*/mcutest/**" "${EC_DIR}/zephyr/test/**" "${EC_DIR}/include/mock/**" "${EC_DIR}/common/mock/**" @@ -344,7 +344,7 @@ merged_coverage: "${EC_DIR}/test/**" "${EC_DIR}/include/tests/**" "${EC_DIR}/private/test/**" - "${EC_DIR}/private/fingerprint/google-fpalg/mcutest/**" + "${EC_DIR}/private/fingerprint/*/mcutest/**" "${EC_DIR}/zephyr/test/**" "${EC_DIR}/include/mock/**" "${EC_DIR}/common/mock/**" diff --git a/docs/code_coverage.md b/docs/code_coverage.md index 7f0c544692..49b6cfb493 100644 --- a/docs/code_coverage.md +++ b/docs/code_coverage.md @@ -35,7 +35,7 @@ lcov -o build/coverage/${BOARD}_merged.info --rc lcov_branch_coverage=1 \ lcov -o build/coverage/${BOARD}_filtered.info --rc lcov_branch_coverage=1 \ -r build/coverage/${BOARD}_merged.info ${PWD}'/third_party/**' \ ${PWD}'/build/**' '/usr/include/**' '/usr/lib/**' '${PWD}/test/**' \ - ${PWD}'/private/fingerprint/google-fpalg/mcutest/**' + ${PWD}'/private/fingerprint/*/mcutest/**' # Restrict to only files used by the board grep "SF:" "build/coverage/initial-${BOARD}.info" | sort -u | \ sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1 \ diff --git a/zephyr/firmware_builder.py b/zephyr/firmware_builder.py index 1e46603faa..1cba339d5e 100755 --- a/zephyr/firmware_builder.py +++ b/zephyr/firmware_builder.py @@ -350,7 +350,7 @@ def test(opts): platform_ec / "test/**", platform_ec / "include/tests/**", platform_ec / "private/test/**", - platform_ec / "private/fingerprint/google-fpalg/mcutest/**", + platform_ec / "private/fingerprint/*/mcutest/**", zephyr_dir / "test/**", third_party / "zephyr/main/subsys/testsuite/**", # Exclude mocks & emulators |