From b8bf42b33a30e11d2a97fac4e897cfde76d6ca0d Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Wed, 18 Aug 2021 15:29:36 -0600 Subject: zephyr: zmake: organize the commit hashes a bit better - Put EC repo first, since that's probably the most useful commit hash. - Put Zephyr kernel second, since that's probably the second most useful commit hash. - Put all other modules after that, alphasorted. BUG=b:184832251 BRANCH=none TEST=updated unit tests Signed-off-by: Jack Rosenthal Change-Id: Id14e9706980d733637e29643dd355aaa82a51fc2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3105265 Reviewed-by: Yuval Peress Reviewed-by: Keith Short --- zephyr/zmake/tests/test_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'zephyr/zmake/tests') diff --git a/zephyr/zmake/tests/test_version.py b/zephyr/zmake/tests/test_version.py index 4407e52642..8fb4a09435 100644 --- a/zephyr/zmake/tests/test_version.py +++ b/zephyr/zmake/tests/test_version.py @@ -76,21 +76,21 @@ def _setup_example_repos(tmp_path): _git_commit(mod1) # Has two commits. - mod2 = tmp_path / "mod2" + mod2 = tmp_path / "ec" _git_init(mod2) _git_add(mod2, mod2 / "file2") _git_commit(mod2) _git_add(mod2, mod2 / "file3") _git_commit(mod2) - return project, zephyr_base, {"mod1": mod1, "mod2": mod2} + return project, zephyr_base, {"mod1": mod1, "ec": mod2} def test_version_string(tmp_path): project, zephyr_base, modules = _setup_example_repos(tmp_path) assert ( version.get_version_string(project, zephyr_base, modules) - == "prj_v2.6.4-mod1:02fd7a,mod2:b5991f,os:377d26" + == "prj_v2.6.4-ec:b5991f,os:377d26,mod1:02fd7a" ) -- cgit v1.2.1