diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-07 10:25:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-07 10:51:17 +0200 |
| commit | 8bf602d7f5ac9ad6b12db35d3e9e5876014d860e (patch) | |
| tree | 31fb4e611d70e1b448e57451e4886f176fd0756e /testing | |
| parent | 3557d90ca9c21dc9c7f683a8539e027dfe683c9a (diff) | |
wheel_tester.py: No longer use class OPTIONS from the build scripts
The semantics have changed, the OPTIONS dict is not fully populated
at startup.
Task-number: PYSIDE-807
Change-Id: Ic076f4ec8d624119d11e6ee266e2f6ccdb702b1e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/wheel_tester.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py index 147becdf7..100fd18f7 100644 --- a/testing/wheel_tester.py +++ b/testing/wheel_tester.py @@ -65,8 +65,6 @@ 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 - from build_scripts.utils import find_files_using_glob from build_scripts.utils import find_glob_in_path from build_scripts.utils import run_process, run_process_output @@ -77,14 +75,6 @@ import platform log.set_verbosity(1) -def find_executable_qmake(): - return find_executable('qmake', OPTION["QMAKE"]) - - -def find_executable_cmake(): - return find_executable('cmake', OPTION["CMAKE"]) - - def find_executable(executable, command_line_value): value = command_line_value option_str = '--{}'.format(executable) @@ -108,8 +98,8 @@ def find_executable(executable, command_line_value): return value -QMAKE_PATH = find_executable_qmake() -CMAKE_PATH = find_executable_cmake() +QMAKE_PATH = None +CMAKE_PATH = None def get_wheels_dir(): @@ -351,5 +341,12 @@ if __name__ == "__main__": parser.add_argument('--no-install-wheels', '-n', action='store_true', help='Do not install wheels' ' (for developer builds with virtualenv)') + parser.add_argument("--qmake", type=str, + help="Path to qmake") + parser.add_argument("--cmake", type=str, + help="Path to cmake") options = parser.parse_args() + QMAKE_PATH = find_executable('qmake', options.qmake) + CMAKE_PATH = find_executable('cmake', options.cmake) + run_wheel_tests(not options.no_install_wheels) |