diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-09-13 16:56:53 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-20 17:33:46 +0000 |
| commit | 695b3c909c4846493eacd324e9c26933847372d1 (patch) | |
| tree | ff71549a6720d8c68a3b142c6f9186d6a7c4d79b /zephyr/zmake/tests/test_zmake.py | |
| parent | 438f1748043d9b9869a8986ac06208e0102554a8 (diff) | |
| download | chrome-ec-695b3c909c4846493eacd324e9c26933847372d1.tar.gz | |
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>
Diffstat (limited to 'zephyr/zmake/tests/test_zmake.py')
| -rw-r--r-- | zephyr/zmake/tests/test_zmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zephyr/zmake/tests/test_zmake.py b/zephyr/zmake/tests/test_zmake.py index 641f9f3db9..e57a4f5ed3 100644 --- a/zephyr/zmake/tests/test_zmake.py +++ b/zephyr/zmake/tests/test_zmake.py @@ -141,7 +141,7 @@ EXTRAVERSION = """ ) zephyr_base.resolve = mock.Mock(return_value=pathlib.Path(tmpname)) - with patch("zmake.version.get_version_string", return_value="123"): + with patch("zmake.version.get_version_string", return_value=("123", "123")): with patch.object(zmake.project, "Project", return_value=FakeProject()): if use_configure: zmk.configure( |