diff options
| author | iaz1607 <[email protected]> | 2024-01-23 14:05:17 +0300 |
|---|---|---|
| committer | iaz1607 <[email protected]> | 2024-01-23 14:39:54 +0300 |
| commit | 45f8abf493164d68c21dd7764ad270438fb5ab45 (patch) | |
| tree | 2dc83336c6806075002a9fa52cd8de29ae9ed954 | |
| parent | deac0c88a42449a04320d6317892eb190a807139 (diff) | |
Stop using svn in canonization tests
| -rw-r--r-- | build/plugins/ytest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index 182e4b25e4c..a98fb4cb219 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -1187,14 +1187,16 @@ def onsetup_run_python(unit): def get_canonical_test_resources(unit): unit_path = unit.path() - canon_data_dir = os.path.join(unit.resolve(unit_path), CANON_DATA_DIR_NAME, unit.get('CANONIZE_SUB_PATH') or '') - + if unit.get("CUSTOM_CANONDATA_PATH"): + path_to_canondata = unit_path.replace("$S", unit.get("CUSTOM_CANONDATA_PATH")) + else: + path_to_canondata = unit.resolve(unit_path) + canon_data_dir = os.path.join(path_to_canondata, CANON_DATA_DIR_NAME, unit.get('CANONIZE_SUB_PATH') or '') try: _, dirs, files = next(os.walk(canon_data_dir)) except StopIteration: # path doesn't exist return [], [] - if CANON_RESULT_FILE_NAME in files: return _get_canonical_data_resources_v2(os.path.join(canon_data_dir, CANON_RESULT_FILE_NAME), unit_path) return [], [] |