aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-01-23 17:29:51 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2020-01-24 02:53:34 +0530
commit2c8e676e2bc490e7d7e9e2649fcbc2d9afefd5e0 (patch)
tree1527db3ea2bf2b13599d1c6234c5ed057febd0c4 /run_project_tests.py
parent4d93a1142749e86bc09764cef7f591776d3b523e (diff)
downloadmeson-2c8e676e2bc490e7d7e9e2649fcbc2d9afefd5e0.zip
meson-2c8e676e2bc490e7d7e9e2649fcbc2d9afefd5e0.tar.gz
meson-2c8e676e2bc490e7d7e9e2649fcbc2d9afefd5e0.tar.bz2
tests: Fix some test failures on Ubuntun 16.04 CI
* xenial doesn't ship many dependencies, so make them all optional since we don't guarantee that everything will work * cmake/{5,6}: needs stdlib.h for EXIT_SUCCESS on GCC 5 * common/222: needs C++11, and GCC 5 doesn't understand `auto` correctly unless we explicitly enable it. * frameworks/1 boost: xenial doesn't ship boost_python3, so make it properly optional * frameworks/6 gettext: gettext can be installed without xgettext, which doesn't cause the project to fail, but the installed files list is different which causes the test to fail. * frameworks/7 gnome: gobject-introspection can't be enabled because the sanitizer unit test detects leaks in glib and fails
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index c0adb8e..e480160 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -94,6 +94,7 @@ 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)
do_debug = under_ci or print_debug
no_meson_log_msg = 'No meson-log.txt found.'
@@ -539,7 +540,8 @@ def have_java():
return False
def skippable(suite, test):
- if not under_ci:
+ # Everything is optional when not running on CI, or on Ubuntu 16.04 CI
+ if not under_ci or under_xenial_ci:
return True
if not suite.endswith('frameworks'):