diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/runner.py | 10 | ||||
| -rw-r--r-- | testing/wheel_tester.py | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/testing/runner.py b/testing/runner.py index ad1e01d65..4d96fdfc2 100644 --- a/testing/runner.py +++ b/testing/runner.py @@ -20,7 +20,7 @@ this_dir = os.path.dirname(this_file) build_scripts_dir = os.path.abspath(os.path.join(this_dir, "..")) sys.path.append(build_scripts_dir) -from build_scripts.utils import detect_clang +from build_scripts.utils import detect_clang # noqa: E402 class TestRunner: @@ -78,11 +78,12 @@ class TestRunner: Helper for _find_ctest() that finds the ctest binary in a build system file (ninja, Makefile). """ - look_for = "--force-new-ctest-process" + # Looking for a command ending this way: + look_for = "\\ctest.exe" if "win32" in sys.platform else "/ctest" line = None with open(file_name) as makefile: for line in makefile: - if look_for in line: + if look_for in line and line.lstrip().startswith("COMMAND"): break else: # We have probably forgotten to build the tests. @@ -98,7 +99,8 @@ class TestRunner: raise RuntimeError(msg) # the ctest program is on the left to look_for assert line, f"Did not find {look_for}" - ctest = re.search(r'(\S+|"([^"]+)")\s+' + look_for, line).groups() + look = re.escape(look_for) + ctest = re.search(fr'(\S+{look}|"([^"]+{look})")', line).groups() return ctest[1] or ctest[0] def _find_ctest(self): diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py index 0f6fb04ff..e5b47ffc1 100644 --- a/testing/wheel_tester.py +++ b/testing/wheel_tester.py @@ -84,10 +84,10 @@ def package_prefix_names(): # Note: shiboken6_generator is not needed for compile_using_nuitka, # but building modules with cmake needs it. if NEW_WHEELS: - return ["shiboken6", "shiboken6_generator", "PySide6_Essentials", "PySide6_Addons", - "PySide6"] + return ["shiboken6", "shiboken6_generator", "pyside6_essentials", "pyside6_addons", + "pyside6"] else: - return ["shiboken6", "shiboken6_generator", "PySide6"] + return ["shiboken6", "shiboken6_generator", "pyside6"] def clean_egg_info(): |