aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-02-09 01:47:31 -0500
committerXavier Claessens <xclaesse@gmail.com>2023-02-13 09:09:10 -0500
commit115f2983618112de7e794389e2227d6fa7fbd2d4 (patch)
tree847ff6a6c5cd56cb26e33c1e96eb93027f78c5ed
parent06ba880a4857b966d37b2d1a506d776c8f9411b8 (diff)
downloadmeson-115f2983618112de7e794389e2227d6fa7fbd2d4.zip
meson-115f2983618112de7e794389e2227d6fa7fbd2d4.tar.gz
meson-115f2983618112de7e794389e2227d6fa7fbd2d4.tar.bz2
tests: do not run the deprecated python3 tests unless python is python3
It's broken in e.g. pypy, but that's okay because the module is utterly deprecated, and people should use the python module instead.
-rwxr-xr-xrun_project_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index 8fb276c..5caedbe 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -1104,7 +1104,7 @@ def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List
TestCategory('swift', 'swift', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('swiftc')),
# CUDA tests on Windows: use Ninja backend: python run_project_tests.py --only cuda --backend ninja
TestCategory('cuda', 'cuda', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('nvcc')),
- TestCategory('python3', 'python3', backend is not Backend.ninja),
+ TestCategory('python3', 'python3', backend is not Backend.ninja or 'python3' not in sys.executable),
TestCategory('python', 'python'),
TestCategory('fpga', 'fpga', shutil.which('yosys') is None),
TestCategory('frameworks', 'frameworks'),
@@ -1591,7 +1591,7 @@ if __name__ == '__main__':
clear_transitive_files()
print('Meson build system', meson_version, 'Project Tests')
- print('Using python', sys.version.split('\n')[0])
+ print('Using python', sys.version.split('\n')[0], f'({sys.executable!r})')
if 'VSCMD_VER' in os.environ:
print('VSCMD version', os.environ['VSCMD_VER'])
setup_commands(options.backend)