diff options
| author | Simon Glass <sjg@chromium.org> | 2024-12-14 11:20:20 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-25 16:27:24 -0600 |
| commit | ba87a2fcfbfb79813983f106c212684907ca6c55 (patch) | |
| tree | e30472e331ce5cee1e5c27cd8363db9c5d22fc2d | |
| parent | 0e198ff1a9114763af3e82e7abf884ee1da4e64f (diff) | |
| download | u-boot-ba87a2fcfbfb79813983f106c212684907ca6c55.tar.gz | |
test/py: Provide the correct U_BOOT_SOURCE_DIR to getrole
The u-boot-test-getrole script runs before the normal environment
variables have been set up. This is unavoidable since the script is
providing necessary information to test.py
This means that U_BOOT_SOURCE_DIR is not set in the environment.
As a result, Labgrid uses its default source path, configured in its
environment variable. While this may happen to work, it is not correct.
Also, it causes problems when running from Gitlab, where the runner may
not have access to that source path.
Provide the required source path in U_BOOT_SOURCE_DIR so that Labgrid
does the right thing.
Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: bf89a8f1fc2 ("test: Introduce the concept of a role")
[1] https://patchwork.ozlabs.org/project/uboot/patch/20241211131858.520639-1-sjg@chromium.org/
| -rw-r--r-- | test/py/conftest.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py index 6b7ed0586e2..44b22761a8b 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -161,6 +161,10 @@ def get_details(config): env['U_BOOT_BUILD_DIR'] = build_dir if build_dir_extra: env['U_BOOT_BUILD_DIR_EXTRA'] = build_dir_extra + + # Make sure the script sees that it is being run from pytest + env['U_BOOT_SOURCE_DIR'] = source_dir + proc = subprocess.run(cmd, capture_output=True, encoding='utf-8', env=env) if proc.returncode: |