aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-07-14 20:44:56 +0300
committerGitHub <noreply@github.com>2020-07-14 20:44:56 +0300
commit3803ca1a38ba0934d1fc47018eb3ec58081b5950 (patch)
treeda4285f0b555892e09fea734a11224cca9ed3972 /run_project_tests.py
parentf2dad788e782a9e7b5abb8a036370f6d8e29f7fc (diff)
parentc9d8d4628e4ae4409d09f255cc18517cdd5f1fbe (diff)
downloadmeson-3803ca1a38ba0934d1fc47018eb3ec58081b5950.zip
meson-3803ca1a38ba0934d1fc47018eb3ec58081b5950.tar.gz
meson-3803ca1a38ba0934d1fc47018eb3ec58081b5950.tar.bz2
Merge pull request #7436 from scivision/python_tests
Python test upgrade
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index c368253..793c844 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -361,11 +361,10 @@ def _run_ci_include(args: T.List[str]) -> str:
if not args:
return 'At least one parameter required'
try:
- file_path = Path(args[0])
- data = file_path.open(errors='ignore', encoding='utf-8').read()
+ data = Path(args[0]).read_text(errors='ignore', encoding='utf-8')
return 'Included file {}:\n{}\n'.format(args[0], data)
except Exception:
- return 'Failed to open {} ({})'.format(args[0])
+ return 'Failed to open {}'.format(args[0])
ci_commands = {
'ci_include': _run_ci_include
@@ -939,7 +938,7 @@ def detect_tests_to_run(only: T.List[str], use_tmp: bool) -> T.List[T.Tuple[str,
# 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('python', 'python', backend is not Backend.ninja),
+ TestCategory('python', 'python'),
TestCategory('fpga', 'fpga', shutil.which('yosys') is None),
TestCategory('frameworks', 'frameworks'),
TestCategory('nasm', 'nasm'),