Skip to content

Commit

Permalink
Fix functional test config paths (#1949)
Browse files Browse the repository at this point in the history
* fix functional test runner relative path for config file

* reorder priority

* Added in comments with regards to build configuration file path selection priorities

* add comments for tree path specific build
  • Loading branch information
sieniven authored May 3, 2023
1 parent 3add7bd commit 5c24e40
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions test/functional/test_framework/test_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,16 @@ def __new__(cls, clsname, bases, dct):
def get_default_config_path():
current_file_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
default_config_paths = [
# priority build selections for standard dev envs
# default priority to be for build dir specific build
current_file_path + "/../../../build/test/config.ini",
# tree-path specific for build explicitly built in tree
current_file_path + "/../../config.ini",
# priority host specific build selection for standard dev envs
current_file_path + "/../../../build/x86_64-pc-linux-gnu/test/config.ini",
current_file_path + "/../../../build/aarch64-apple-darwin/test/config.ini",
current_file_path + "/../../../build/x86_64-apple-darwin/test/config.ini",
current_file_path + "/../../../build/x86_64-w64-migw32/test/config.ini",
# aarch64 / arm builds
# aarch64 / arm builds are by default lower priority when selecting host specific build
current_file_path + "/../../../build/arm-linux-gnueabihf/test/config.ini",
current_file_path + "/../../../build/aarch64-linux-gnu/test/config.ini",
]
Expand Down

0 comments on commit 5c24e40

Please sign in to comment.