aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-08-30 20:09:45 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2020-10-30 11:18:11 +0200
commitbca90722ecfc541ac5db7c1c79fb63ceb6286cd4 (patch)
treed8c7669db3823f9bf7037cbced78605e87142edd /run_project_tests.py
parent8fbf10c4bcb5e0294328b67512f9e2f0cbd8d94d (diff)
downloadmeson-bca90722ecfc541ac5db7c1c79fb63ceb6286cd4.zip
meson-bca90722ecfc541ac5db7c1c79fb63ceb6286cd4.tar.gz
meson-bca90722ecfc541ac5db7c1c79fb63ceb6286cd4.tar.bz2
Bump minimum supported Python version to 3.6. Closes #6297.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index acd8590..e4a458e 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -242,7 +242,6 @@ class AutoDeletedDir:
failing_logs = []
print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ
under_ci = 'CI' in os.environ
-under_xenial_ci = under_ci and ('XENIAL' in os.environ)
skip_scientific = under_ci and ('SKIP_SCIENTIFIC' in os.environ)
do_debug = under_ci or print_debug
no_meson_log_msg = 'No meson-log.txt found.'
@@ -828,8 +827,8 @@ def have_java():
return False
def skippable(suite, test):
- # Everything is optional when not running on CI, or on Ubuntu 16.04 CI
- if not under_ci or under_xenial_ci:
+ # Everything is optional when not running on CI
+ if not under_ci:
return True
if not suite.endswith('frameworks'):