aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2022-03-19 13:36:47 +0100
committerChristian Tismer <tismer@stackless.com>2022-03-21 12:04:13 +0100
commitde0c976d67e1bf3b5b34408672ee9c5502b32362 (patch)
tree35a611042133793c71498efd98ef9650369ef19f /testing
parentd28fdab1fc7410739f131b980e15f82fffe92a7e (diff)
testing: update wheel_tester.py to no longer use qmake
This patch removes qmake as an installer tool and updates wheel_tester to use Ninja, only. [ChangeLog][PySide6] wheel_tester was upgraded to work completely with CMake and Ninja. Change-Id: Idbcd4f06614cf1f6b19b7eb1cafd9e873bc6edd3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'testing')
-rw-r--r--testing/wheel_tester.py66
1 files changed, 13 insertions, 53 deletions
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py
index 39b93ef42..db36aa45e 100644
--- a/testing/wheel_tester.py
+++ b/testing/wheel_tester.py
@@ -167,40 +167,19 @@ def try_install_wheels(wheels_dir, py_version):
)
-def is_unix():
- if sys.platform.startswith("linux") or sys.platform == "darwin":
- return True
- return False
-
-
def generate_build_cmake():
- args = [CMAKE_PATH]
- if is_unix():
- args.extend(["-G", "Unix Makefiles"])
- else:
- args.extend(["-G", "NMake Makefiles"])
- args.append("-DCMAKE_BUILD_TYPE=Release")
- args.append(f"-Dpython_interpreter={sys.executable}")
-
- # Specify prefix path so find_package(Qt5) works.
- qmake_dir = os.path.abspath(os.path.join(os.path.dirname(QMAKE_PATH), ".."))
- args.append(f"-DCMAKE_PREFIX_PATH={qmake_dir}")
-
- args.append("..")
-
+ # Specify prefix path so find_package(Qt6) works.
+ qmake_dir = Path(QMAKE_PATH).resolve().parent.parent
+ args = [CMAKE_PATH, "-G", "Ninja", "-DCMAKE_BUILD_TYPE=Release",
+ f"-Dpython_interpreter={sys.executable}",
+ f"-DCMAKE_PREFIX_PATH={qmake_dir}",
+ ".."]
exit_code = run_process(args)
if exit_code:
raise RuntimeError("Failure while running cmake.")
log.info("")
-def generate_build_qmake():
- exit_code = run_process([QMAKE_PATH, "..", f"python_interpreter={sys.executable}"])
- if exit_code:
- raise RuntimeError("Failure while running qmake.")
- log.info("")
-
-
def raise_error_pyinstaller(msg):
print()
print(f"PYINST: {msg}")
@@ -255,29 +234,16 @@ def run_nuitka_test(example):
raise RuntimeError(f"Failure running {example} with Nuitka.")
-def run_make():
- args = []
- if is_unix():
- executable = "make"
- else:
- executable = "nmake"
- args.append(executable)
-
+def run_ninja():
+ args = ["ninja"]
exit_code = run_process(args)
if exit_code:
raise RuntimeError(f"Failure while running {executable}.")
log.info("")
-def run_make_install():
- args = []
- if is_unix():
- executable = "make"
- else:
- executable = "nmake"
- args.append(executable)
- args.append("install")
-
+def run_ninja_install():
+ args = ["ninja", "install"]
exit_code = run_process(args)
if exit_code:
raise RuntimeError(f"Failed while running {executable} install.")
@@ -338,21 +304,15 @@ def try_build_examples():
src_path = os.path.join(examples_dir, "samplebinding")
prepare_build_folder(src_path, "cmake")
generate_build_cmake()
- run_make()
- run_make_install()
+ run_ninja()
+ run_ninja_install()
execute_script(os.path.join(src_path, "main.py"))
log.info("Attempting to build scriptableapplication using cmake.")
src_path = os.path.join(examples_dir, "scriptableapplication")
prepare_build_folder(src_path, "cmake")
generate_build_cmake()
- run_make()
-
- log.info("Attempting to build scriptableapplication using qmake.")
- src_path = os.path.join(examples_dir, "scriptableapplication")
- prepare_build_folder(src_path, "qmake")
- generate_build_qmake()
- run_make()
+ run_ninja()
if sys.version_info[:2] >= (3, 7):
log.info("Checking Python Interface Files in Python 3 with all features selected")