From a90a1edb2a081155b3ec7976984c3fe2001ddbd6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Oct 2018 00:32:33 +0100 Subject: [PATCH] Try to only build tests on Ubuntu 18.04 for now (mostly because of ImageMagick). --- cscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cscript b/cscript index a985fa940..04d3746eb 100644 --- a/cscript +++ b/cscript @@ -334,16 +334,18 @@ def option_defaults(): def configure_options(target, options): opt = '' + + if target.platform != 'linux' or target.distro != 'ubuntu' or target.version != '18.04': + # Currently we only build tests on Ubuntu 18.04 + opt += ' --disable-tests' + if target.debug: opt += ' --enable-debug' if target.platform == 'windows': - opt += ' --target-windows --disable-tests' - elif target.platform == 'osx': - opt += ' --disable-tests' + opt += ' --target-windows' elif target.platform == 'linux': opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': - opt += ' --disable-tests' if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': -- 2.30.2