diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2021-08-20 10:23:55 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-20 17:36:11 +0000 |
commit | 4c1cdd23cb35964608f0a2666f933987b4573899 (patch) | |
tree | 52a8b6531745e8893839d2c5a8f36331a882f061 /zephyr/zmake/tests/test_util.py | |
parent | 93adb802c1a626fbb73d762124e90be4fee08a8b (diff) | |
download | chrome-ec-4c1cdd23cb35964608f0a2666f933987b4573899.tar.gz |
Reland "zephyr: pull in the version string from zmake"
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>
Diffstat (limited to 'zephyr/zmake/tests/test_util.py')
-rw-r--r-- | zephyr/zmake/tests/test_util.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/zephyr/zmake/tests/test_util.py b/zephyr/zmake/tests/test_util.py index 15f92f58ab..0524a153fd 100644 --- a/zephyr/zmake/tests/test_util.py +++ b/zephyr/zmake/tests/test_util.py @@ -87,3 +87,18 @@ def test_read_kconfig_autoconf_value(value): f.write("#define TEST {}".format(value)) read_value = util.read_kconfig_autoconf_value(path, "TEST") assert int(read_value) == value + + +@pytest.mark.parametrize( + ["input_str", "expected_result"], + [ + ("", '""'), + ("TROGDOR ABC-123", '"TROGDOR ABC-123"'), + ("hello world", '"hello world"'), + ("hello\nworld", r'"hello\nworld"'), + ('hello"world', r'"hello\"world"'), + ("hello\\world", '"hello\\\\world"'), + ], +) +def test_c_str(input_str, expected_result): + assert util.c_str(input_str) == expected_result |