diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-11-17 14:51:29 +0100 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-12-03 20:39:09 +0100 |
| commit | 3ce80d312f5da83d97674aff57e238e7a621ccb8 (patch) | |
| tree | 00a6f93185ea4cbcdcfe2a0b3688f4fa39ed0603 /testing | |
| parent | d4764a4c514ec15f4cd680143cbd189482af6251 (diff) | |
Replace OPTION_* by a dictionary
Currently we are importing * from the options.py file,
which is a problem for the linters to discover if we are properly
using the options of the file.
Having a dictionary provides also a better way of access these options,
and it is more clean than having one variable per each option.
Change-Id: Ie70bd88665357b85e2842c5df269857504ecccdf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/wheel_tester.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py index 535cb3712..2bf9d7b09 100644 --- a/testing/wheel_tester.py +++ b/testing/wheel_tester.py @@ -65,8 +65,7 @@ this_dir = os.path.dirname(this_file) setup_script_dir = os.path.abspath(os.path.join(this_dir, '..')) sys.path.append(setup_script_dir) -from build_scripts.options import OPTION_QMAKE -from build_scripts.options import OPTION_CMAKE +from build_scripts.options import OPTION from build_scripts.utils import find_files_using_glob from build_scripts.utils import find_glob_in_path @@ -79,11 +78,11 @@ log.set_verbosity(1) def find_executable_qmake(): - return find_executable('qmake', OPTION_QMAKE) + return find_executable('qmake', OPTION["QMAKE"]) def find_executable_cmake(): - return find_executable('cmake', OPTION_CMAKE) + return find_executable('cmake', OPTION["CMAKE"]) def find_executable(executable, command_line_value): |