| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 695b3c909c4846493eacd324e9c26933847372d1.
Reason for revert: Broke CQ
See https://ci.chromium.org/ui/p/chromeos/builders/postsubmit/trogdor-zephyr-postsubmit/314
Original change's description:
> zmake: Trim short version on full hashes
>
> The ec_version.h contains both a long build string and also a 31 char
> string. Change the short string to omit the commit count, and only
> include full hashes, i.e. hayato_v2.6-ec:5bd1aa,os:ade7b4 not
> hayato_v2.6.73670-ec:5bd1aa,os:
>
> Change test to be a real version string with hashes of the right length.
>
> BUG=None
> BRANCH=None
> TEST=./zephyr/zmake/run_tests.sh
>
> Change-Id: I18d73345036933594b8c74187796c3727f868629
> Signed-off-by: Jeremy Bettis <jbettis@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3160464
> Tested-by: Jeremy Bettis <jbettis@chromium.org>
> Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Bug: None
Change-Id: Ib4282f761c514c0ca2da6249d38ccc9cba852f6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3172040
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The ec_version.h contains both a long build string and also a 31 char
string. Change the short string to omit the commit count, and only
include full hashes, i.e. hayato_v2.6-ec:5bd1aa,os:ade7b4 not
hayato_v2.6.73670-ec:5bd1aa,os:
Change test to be a real version string with hashes of the right length.
BUG=None
BRANCH=None
TEST=./zephyr/zmake/run_tests.sh
Change-Id: I18d73345036933594b8c74187796c3727f868629
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3160464
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add new flag --log-label to be the inverse of --no-log-label.
Set defaults to --log-level=INFO --no-log-label, but if --log-level is
set by the user, then default to --log-label. So a bare zmake command
will output at INFO with no labels, but zmake -l INFO will include
labels.
Suppress the job names [/mnt/.../hayato:ro] from the log lines if
--no-log-label.
Don't remove leading whitespace from logged lines, it messes up the
memory usage table.
Wait for file descriptors to stop writing output before checking for
warnings and errors in the output.
Change "Output file '...' created" to be at DEBUG instead of INFO.
BUG=None
TEST=zmake w/ no flags, -l ERROR, --log-label, --no-log-label
BRANCH=None
Change-Id: I76567ab49d5d9019c5f25c618fe10816fb2cfd35
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3153592
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The coverage report removes the chroot prefix from the paths, but we
need to use the module_paths instead of checkout so it will work on
gitlab.
BUG=None
TEST=Pushed to gitlab coverage branch
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I0ff47d71f95deae55714988f69d710ba95b71e6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3139095
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Our GitLab builder uses different toolchains than the supported ones
we use for development. At present, this means that the GitLab CI
needs to call -t for each build with the desired toolchain, preventing
us from using the more general commands "zmake coverage" or "zmake
testall".
Extend the idea of toolchain in our config files to be "supported
toolchains" instead (i.e., multiple toolchains can be supported
instead of one. We do this by refactoring our toolchain support code
to consist of two related methods:
- "probe" returns True if the toolchain is detected on the system, or
False otherwise
- "get_toolchain_config" returns the BuildConfig associated with the
toolchain for the system, mirroring the functionality previously
implemented in lambda functions.
Also dropped support for arm-none-eabi, as I believe this was only
used early on during scarlet development, and am not aware of any
current users.
BUG=b:178731498
BRANCH=none
TEST=./run_tests.sh
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I9b2ad508ae6703f0c3b56518fc32606c0ff1777c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3134668
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If we are running zmake -j1 coverage, then wait after each job so that
nothing runs in parallel.
BUG=None
TEST=zmake -j1 coverage
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ic709cd187414f3886bc28731f78748993bfac95e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3130624
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In chroot, you can always use llvm-cov to parse the coverage files, but
in zephyr sdk, you have to use the right gcov binary for each toolchain.
Use cmake to build a gcov shell script, and call it from zmake coverage.
BUG=None
TEST=zmake coverage in chroot and gitlab
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I6203445f0a412193e8280bb5cdf7994d5346fdbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3130622
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Exclude the NPCX monitor binary sources from coverage
BUG=b:197162681
BRANCH=none
TEST=zmake testall, zmake converage /tmp/zephyr-coverage
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I86c5270d3599ac486c84479e64225839b4374502
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3122865
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
zmake build was changed to generate ec_version.h, update zmake coverage
to do the same.
BUG=None
TEST=zmake coverage
BRANCH=none
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ib65f862843617a3ee64d0e68b2b9e204afc85787
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3115429
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We don't use getversion.sh for our version strings, and this is purely
for informational purposes only, so just delete it.
BUG=b:184832251
BRANCH=none
TEST=unit tests
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I479c25e4b2cc675cd24d173e56cc505c7e29f1ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3111229
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 93adb802c1a626fbb73d762124e90be4fee08a8b.
This commit was reverted due to build failures with the
chromeos-zephyr ebuild. The root cause of the build failures was that
the ebuild uses different working directories between the configure
and build phases, and so the path to the include directory we generate
during the configure phase won't work in the build phase.
Use the full path here so that we can run the diffrerent phases in
different working directories.
Diff from original commit:
Change-Id: Idcbd0c0546f9fcb12fcd66c617e024b8aa2a893a
> --- a/zephyr/zmake/zmake/zmake.py
> +++ b/zephyr/zmake/zmake/zmake.py
> @@ -235,7 +235,7 @@ class Zmake:
> self.logger.info("Clearing old build directory %s", build_dir)
> shutil.rmtree(build_dir)
>
> - generated_include_dir = build_dir / "include"
> + generated_include_dir = (build_dir / "include").resolve()
> base_config = zmake.build_config.BuildConfig(
> environ_defs={"ZEPHYR_BASE": str(zephyr_base), "PATH": "/usr/bin"},
> cmake_defs={
BUG=b:197287679
BRANCH=none
TEST=emerge-volteer chromeos-zephyr
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I80cec7a1622edcecc670b7dbeed56dadcdf71555
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3111305
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 10809eb023d475681b45863e68d906fae4667eda.
Reason for revert: Causing build errors b/197287679
Original change's description:
> zephyr: pull in the version string from zmake
>
> Zmake computes a version string and stores it in FRID/FWID, but this
> was never plumbed all the way out into the version functionality in
> the OS, which was reporting the version generated by
> util/getversion.sh.
>
> Add a mechanism to generate the version header from zmake and replace
> the getversion.sh generation with that.
>
> BUG=b:184832251
> BRANCH=none
> TEST=provided unit tests
> TEST=get this version string on posix-ec:
> posix-ec_v2.6.73347-cmsis:c3bd20,ec:c814a9,hal_stm32:f8ff8d,os:efe095
> 2021-08-18 14:10:18 jrosenth@germania
>
> Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> Change-Id: Idec1c5f8b5f014126706e4fdc1f3d158edf40a63
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3104625
> Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Bug: b:184832251
Change-Id: Ifcc4830e3097c8dc8126bb76adfeb3ce75a7a667
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3110293
Auto-Submit: Rob Barnes <robbarnes@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Zmake computes a version string and stores it in FRID/FWID, but this
was never plumbed all the way out into the version functionality in
the OS, which was reporting the version generated by
util/getversion.sh.
Add a mechanism to generate the version header from zmake and replace
the getversion.sh generation with that.
BUG=b:184832251
BRANCH=none
TEST=provided unit tests
TEST=get this version string on posix-ec:
posix-ec_v2.6.73347-cmsis:c3bd20,ec:c814a9,hal_stm32:f8ff8d,os:efe095
2021-08-18 14:10:18 jrosenth@germania
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Idec1c5f8b5f014126706e4fdc1f3d158edf40a63
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3104625
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This command was intended for use in ebuild, but never instrumented.
Remove the dead code.
BUG=b:195571108
BRANCH=none
TEST=zephyr/zmake/run_tests.sh
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I68d3da2e4dfdb4a44b5a58d2b8e2c01da373c06f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3086366
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run black on all files. Enable check in run_tests.sh to enforce
future formatting requirements.
BUG=b:192389533
BRANCH=none
TEST=run_tests.sh
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I5d93ef61d32d0dab4fe4bf3a77faf3f6693be627
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3002839
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Putting execution of "pytest" inside of zmake testall itself is
problematic: The path this code runs relies on a lot of zmake's
features, and if there were a bug in zmake that prevented that code
from being reached, the code could never get executed. Additionally,
the log output is impossible to read as it gets mixed in with all the
build output.
Separate it into a simple shell script, which greatly simplifies the
code, and makes it easier to add further style tests down the
road (isort, flake8, black).
BUG=b:192389533
BRANCH=none
TEST=run firmware_builder.py
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I8795ba0c0225183b597f3738575c790ba73610f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3002837
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This simple subcommand in zmake prints the compatible Zephyr
versions for the project. It will be used in the zephyr
ebuild to set the correct zephyr-base and modules directories.
BRANCH=none
BUG=b:190731415, b:191892353
TEST=zmake print-versions zephyr/projects/volteer/volteer
TEST=added unit tests
Change-Id: If597035f71cca1e90c9402dbdb0e5e558e1e0892
Signed-off-by: Yuval Peress <peress@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2984298
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both Cmake and ninja can report errors and warnings which are
currently lost, unless debugging is on. Update the filters to handle
all warnings/errors the same.
BUG=b:184298184
BRANCH=none
TEST=manually tested after seeing errors/warnings along the way
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ib1893e3d634e22962623f132672e6df80d00da20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2957551
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Allow passing a --cq flag to zmake for running a CQ pass. When done,
zmake will remove flaky features such as hypothesis health checks which
cause pytests to fail when taking longer than "expected". Note that the
health checks ignore the deadline set on each function and will still
fail if they deem the test to have run too long.
BRANCH=none
BUG=b:190229270, b:190957007
TEST=sudo emerge chromeos-base/zephyr-build-tools && \
zmake --cq testall
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: Iaf9a38e0bbd65f0be9521019a615279d8b5fbb49
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2977586
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some of the drivers were being excluded from the coverage report
because of symlinks in the build/zephyr/test directory, which matched
*/test/*. Changed to be */ec/test/* and */ec/zephyr/test/*.
Also exclude the emulators, as they should not affect coverage numbers.
BUG=b:183007888
TEST=sudo emerge zephyr-build-tools && \
zmake coverage build/zmake-coverage
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I95aa2655f0396672c25b7c317e1e08c403703510
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2937741
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit a984234afc7763018f9b5f9e767e567fd1137e4c.
Reason for revert: Seeing if this can be landed now
Original change's description:
> Revert "zephyr: zmake: Show devicetree / compiler errors"
>
> This reverts commit 6b3b01cbf8a7c2a6a41402fcbc504028b4434497.
>
> Reason for revert: depends on CL:2807486, which is responsible for CQ
> failures (crbug.com/1198472).
>
> BUG=chromium:1198472
> BRANCH=none
> TEST=pytest zephyr/zmake/test
>
> Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> Change-Id: I3f05e547c95b05d0ac3803bed946d7666346bf25
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823546
> Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
BUG=b:184298184, chromium:1198472
BRANCH=none
TEST=(cd zephyr/zmake/; python3 -m pytest tests/*.py -v -k test_filter)
Change-Id: I9065a5682090b5e32414bbb6a518788ec02a6f0c
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2841024
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This partially reverts commit 5bc4134337bdabd601159bce047306c73f13e8f8.
Reason for revert: Seeing if this can be landed now
I removed test_filter_debug() from this CL, since it has already been
submitted with a full check of the output.
Original change's description:
> Revert "zephyr: zmake: Ensure all output is produced"
>
> This reverts commit ee4257735632f5453b9377f9f60f5c68f6917537.
>
> Reason for revert: depends on CL:2807486, which is responsible for CQ
> failures (crbug.com/1198472).
>
> BUG=chromium:1198472
> BRANCH=none
> TEST=pytest zephyr/zmake/test
>
> Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> Change-Id: I5face75f3e59858b68a0b6e77d5c5b1a9881008a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823547
> Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
BUG=b:184298184, chromium:1198472
BRANCH=none
TEST=(cd zephyr/zmake/; python3 -m pytest tests/*.py -v -k test_filter)
Change-Id: I0a02d32234d871ba45833eaaab0e979b28257ca8
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2841023
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With this change, only real warnings and errors show in the output.
BUG=b:184298184
TEST=zmake testall
BRANCH=None
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I059325d3cdf0b118d35a62be63710327dfac3636
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2863944
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since many commands are running in parallel, prefix each line of output
with the project that generated that output.
BUG=b:184298184
TEST=zmake testall
BRANCH=None
Change-Id: I1d5d66c0c1366aff96ac0b46a290c52c6db747a4
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2863943
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If "zmake build" is passed a relative directory (as is the case with
the chromeos-base/chromeos-zephyr ebuild), we need to resolve it to
the absolute path before using it in a binman invocation, as binman is
invoked in a different working directory than "zmake build" was
started from.
BUG=b:181337770
BRANCH=none
TEST=emerge-trogdor-zephyr chromeos-zephyr
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Idd9896f240013760f40cf40387f01bfc291a6f57
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2865026
Commit-Queue: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add version information to FRID/FWID using get_version_string.
Note: static version option is not plumbed yet to main function, will
handle in follow up CL later (non-critical feature).
Note: version is not copied into build yet, will do that in a
follow-up CL too, which will get rid of our cmake call to
get_version.sh.
BUG=b:184832251
BRANCH=none
TEST=zmake configure -b -B /tmp/lazor projects/trogdor/lazor
dump_fmap -x /tmp/lazor/outputs/zephyr.bin RO_FRID RW_FWID
observe contents of RO_FRID RW_FWID
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I95e960b6d13360ac4dbad928da9580909b0e2ec7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2857915
Commit-Queue: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 477997408185b0d446d388239a53657de6367570.
Reason for revert: Introduces flakes to the CQ
BUG=chromium:1196696
TEST=none
Original change's description:
> Reland "zephyr: zmake: Add a test for zmake and output filtering"
>
> This reverts commit 3ea453e890f2f782e8195c94af5de00c8c754f74.
>
> Reason for revert: Trying again to see what error is produced
>
> Original change's description:
> > Revert "zephyr: zmake: Add a test for zmake and output filtering"
> >
> > This reverts commit ca160a3394c952f0732f66eb113b9735b5655ed2.
> >
> > Reason for revert: responsible for CQ failures (crbug.com/1198472)
> >
> > BUG=chromium:1198472
> > BRANCH=none
> > TEST=pytest zephyr/zmake/test
> >
> > Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> > Change-Id: I273ee3e26309d595973ec8040a2d835169096670
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2824028
> > Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
>
> Bug: chromium:1198472
> Change-Id: Icaae5c6698f6747b634952d03ae83668e937c089
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2822402
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Bug: chromium:1198472
Change-Id: Iabbfdf2c7af82113d91f9aeba256024b7e59b4f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2842363
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 3ea453e890f2f782e8195c94af5de00c8c754f74.
Reason for revert: Trying again to see what error is produced
Original change's description:
> Revert "zephyr: zmake: Add a test for zmake and output filtering"
>
> This reverts commit ca160a3394c952f0732f66eb113b9735b5655ed2.
>
> Reason for revert: responsible for CQ failures (crbug.com/1198472)
>
> BUG=chromium:1198472
> BRANCH=none
> TEST=pytest zephyr/zmake/test
>
> Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> Change-Id: I273ee3e26309d595973ec8040a2d835169096670
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2824028
> Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Bug: chromium:1198472
Change-Id: Icaae5c6698f6747b634952d03ae83668e937c089
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2822402
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Python, a lambda or function will capture variables in the parent
scope, but using a variable in a loop does not create a new scope.
Thus, the test_file argument is being executed as the current value of
test_file, not necessarily the value that happened that iteration in
the loop.
Prior to this CL, we were not guaranteed to run every pytest. It's
racy and causes us to run some tests twice or even three times, while
completely skipping other tests.
Using a default argument in the lambda will bind to the current value
instead of the variable.
See this SO post for further discussion:
https://stackoverflow.com/questions/2295290
BUG=none
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I5eda075980cce0af13fb7a114fd1917fa6732754
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823148
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make the executor object which is currently used in the testall and
coverage methods a member of the Zmake object. This will allow us to
apply the executor in more places, creating better practices about how
we claim and release our jobs.
BUG=b:185163907
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Idccf0d053ea8b5ee91a47891705d95a048a7036a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2821607
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This functionality is something which fundamentally leads to buggy
code, as allowing multiproc.Executor.wait() to return while jobs are
actually still running means the programmer needs to consider the case
that subprocesses are still doing work.
Remove it.
BUG=chromium:1188822,b:182818881,b:185163907
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: Iffa9770734ce4fce8d62de2e3472235eb1cf9c4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2821606
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ca160a3394c952f0732f66eb113b9735b5655ed2.
Reason for revert: responsible for CQ failures (crbug.com/1198472)
BUG=chromium:1198472
BRANCH=none
TEST=pytest zephyr/zmake/test
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I273ee3e26309d595973ec8040a2d835169096670
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2824028
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ee4257735632f5453b9377f9f60f5c68f6917537.
Reason for revert: depends on CL:2807486, which is responsible for CQ
failures (crbug.com/1198472).
BUG=chromium:1198472
BRANCH=none
TEST=pytest zephyr/zmake/test
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I5face75f3e59858b68a0b6e77d5c5b1a9881008a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823547
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 6b3b01cbf8a7c2a6a41402fcbc504028b4434497.
Reason for revert: depends on CL:2807486, which is responsible for CQ
failures (crbug.com/1198472).
BUG=chromium:1198472
BRANCH=none
TEST=pytest zephyr/zmake/test
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I3f05e547c95b05d0ac3803bed946d7666346bf25
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2823546
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some errors are currently suppressed by default which is not very
friendly. Fix this.
BUG=b:177096315
BRANCH=none
TEST=(cd zephyr/zmake/ && python3 -m pytest .)
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Icdf8e8c91003a3f89d20c704a324673e1269cb0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2809781
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At present if one process finishes with an error the output of other
processes may be truncated, since zmake exits immediately. This can be
confusing since running repeatedly gives different output.
Fix it by waiting until all processes are complete before exiting.
BUG=b:184298184
BRANCH=none
TEST=(cd zephyr/zmake/ && python3 -m pytest .)
Change-Id: Ib6c3dd5966c2b381d811c84e3c1c5b5f5fc3cf9a
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2801173
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At present there are no tests for zmake.py itself. Add a simple one to
provide some coverage.
Use this to test that the filtering does what we expect. This works by
using some pre-canned output for the RO and RW, running each file
through a separate 'cat' command in its own process, then comparing
the results obtained in the log.
In creating this test, unexpected behaviour was found with the
image-size logging (Memory, FLASH:, etc), in that they end up on the
ERROR level, if previous output has appeared on that level. This is
because the default log level changes to whatever the last log output
was. So fix this at the same time.
For now we don't check the DEBUG level, since it has a bug.
BUG=b:177096315
BRANCH=none
TEST=(cd zephyr/zmake/ && python3 -m pytest .)
Signed-off-by: Simon Glass <sjg@chromium.org>
Cq-Depend: chromium:2819138
Change-Id: Iaa777815b577ab814eb2e69d34a3047ae57f0b45
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2807486
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix zmake coverage, it was still using the removed claim_job flag.
Change zmake coverage to output a summary lcov.info file as well.
Implement zephyr/firmware_builder.py --code-coverage test.
Implement zephyr/firmware_builder.py --code-coverage bundle.
BRANCH=none
BUG=b:183007888
TEST=cros workon --host start chromeos-base/zephyr-build-tools
sudo emerge chromeos-base/zephyr-build-tools
zephyr/firmware_builder.py --metrics=/tmp/m --code-coverage test
zephyr/firmware_builder.py --metrics=/tmp/m --code-coverage bundle
tar tvf /tmp/artifact_bundles/coverage.tbz2
cat /tmp/artifact_bundle_metadata
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I3fbdc4e57029d23a4d24b7ad6e003ee624c75f37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2809354
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At present the logging map from one test can still be around for a
following tests. This can cause strange behaviour.
Add a reset() function to help with this. Call it from the Zmake
constructor which is used by any test which cares about this.
BUG=b:177096315
BRANCH=none
TEST=with other CLs, see that the tests pass when all run together
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I0bf112e705c6badd3958a0afba8a3761e95fa547
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2809780
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At present with 'zmake build' everything happens in parallel. This is
nice because it saves time.
However if there is a build error, or some warnings, these typically
appear twice, since both the RO and RW builds are (mostly?) compiling
the same code.
It is not useful to show the same message twice. As a partial
solution, use -j1 to make the RO and RW builds happen one after
the other, stopping if the first one fails. This flag can be used in
an IDE to provide friendlier output.
Admittedly this results in a slower build, but the difference is only
material when Kconfig or device tree have changed and everything is
being rebuilt. Most of the time an incremental build only takes a
second, so this option is quite handy.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
FEATURE=test sudo -E emerge zephyr-build-tools
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ie66cf894a87b05a7648a77767e37e94636771c6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789798
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now that we are showing warnings by default (and not requiring
-l DEBUG) they are more likely to receive action. But for the commit
queue it seems useful to fail the build if there are any warnings,
just in case people are not very observant in their local builds.
Add a -w flag for this. It works by checking for any output in the
ERROR log, which is safer now that we have cleaned up the error
output to just include actual errors.
Put the check in a separate function since it will be called from
a different place in a future CL.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
FEATURE=test sudo -E emerge zephyr-build-tools
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I4c0ec53d2836ce0ba67b3c8bcf39b53fa1af2945
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789797
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added a new zmake sub-command `coverage`, which builds all projects
with coverage, runs unit tests, and creates a html coverage report.
BUG=b:183007888
TEST=sudo emerge zephyr-build-tools && \
zmake coverage build/ztest-coverage
BRANCH=none
Change-Id: Idb6af59c223ece00d3eb09982778cb1b500d8db4
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2794925
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A new generator function which searches subdirectories for zmake
projects.
BUG=b:183007888
TEST=zmake testall
BRANCH=none
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Iceca946a12e0e64a46c5994366734addb3e24cb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2795931
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There really isn't an obvious distinction here between something that
is critical and something that is just an error. They are both errors
and stop the build, requiring user action. Drop this test and let
everything that doesn't otherwise match become an ERROR.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I94342d9425046285efde8ec9d9c79e79ad9ba181
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789796
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The 'Including boilerplate' message is still there on every build and
still doesn't seem that useful. Add a filter to the stderr output so we
can move it to DEBUG.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I6e356c0abecbbba624fd41144a3c460398a4e874
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789795
Reviewed-by: Yuval Peress <peress@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When ninja gets an error it reports that the build stops, but we know
that since we see the error and get a return code. Move it to DEBUG.
Similarly cmake shows FAILED which is not useful since we can see the
actual error immediately above, so move it to INFO.
Also it prints out the command that failed but this is normally just a
20-line compiler invocation command which is not actionable and makes
it easy to miss the one-line, useful error from the compiler. Move
that to DEBUG.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I0a5946e0210c05f09c0af06817fd263ee17384f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789794
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This output appears when a Kconfig or devicetree change is detected.
It the same every time and is not an error. Move it to INFO.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake build / configure
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I585dbff4439650f031318ebd0c6c5a35c8f1ff2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2789793
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update the filter to assume everything it doesn't know about is an
error. This is safer than leaving it as an INFO message.
On the other hand, build success should be assumed unless otherwise
notified, so move the *** SUCCESS *** message and associated asterisk
lines to DEBUG.
The build ends with a note about memory usage. This is helpful, but is
not an error, so show it on the default INFO.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake configure / build
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ief932c2f6343049c0b21493231c72c0390bfd444
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2788847
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Perhaps unique among ninjas, 'ninja' is very noisy about its progress.
This information is not actionable and goes past so quickly only a
true ninja could read it. Move it to DEBUG.
Do the same with 'Entering directory' since this happens every time and
is not very interesting.
BUG=b:177096315
BRANCH=none
TEST=manually test by running zmake with -D
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ied1ac3e73d14b8cd6009aa7ad4247d4fcc6a849b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2788846
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
|