diff options
| author | Tom Rini <trini@konsulko.com> | 2024-12-25 22:31:04 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-12-25 22:31:04 -0600 |
| commit | 5cfbf8c3644cc95c3c8b5d2541ed7f32136c0da1 (patch) | |
| tree | 3acd513189d5a8ba449a6e213a57c53f3fb2cdfb /test/py/conftest.py | |
| parent | 2c366eb1cd7ecad7b1d955b54219ba1447e2a47d (diff) | |
| parent | 3391587e3fe22db6c71882f652e13543a4501694 (diff) | |
Merge tag 'v2025.01-rc5' into next
Prepare v2025.01-rc5
Diffstat (limited to 'test/py/conftest.py')
| -rw-r--r-- | test/py/conftest.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py index d9f074f3817..509d19b449d 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -144,6 +144,9 @@ def get_details(config): # Get a few provided parameters build_dir = config.getoption('build_dir') build_dir_extra = config.getoption('build_dir_extra') + + # The source tree must be the current directory + source_dir = os.path.dirname(os.path.dirname(TEST_PY_DIR)) if role: # When using a role, build_dir and build_dir_extra are normally not set, # since they are picked up from Labgrid-sjg via the u-boot-test-getrole @@ -172,15 +175,13 @@ def get_details(config): # Read the build directories here, in case none were provided in the # command-line arguments (board_type, board_type_extra, default_build_dir, - default_build_dir_extra, source_dir) = (vals['board'], - vals['board_extra'], vals['build_dir'], vals['build_dir_extra'], - vals['source_dir']) + default_build_dir_extra) = (vals['board'], + vals['board_extra'], vals['build_dir'], vals['build_dir_extra']) else: board_type = config.getoption('board_type') board_type_extra = config.getoption('board_type_extra') board_identity = config.getoption('board_identity') - source_dir = os.path.dirname(os.path.dirname(TEST_PY_DIR)) default_build_dir = source_dir + '/build-' + board_type default_build_dir_extra = source_dir + '/build-' + board_type_extra |