Try to only build tests on Ubuntu 18.04 for now (mostly because of ImageMagick).
authorCarl Hetherington <cth@carlh.net>
Fri, 12 Oct 2018 23:32:33 +0000 (00:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 12 Oct 2018 23:32:33 +0000 (00:32 +0100)
cscript

diff --git a/cscript b/cscript
index a985fa9..04d3746 100644 (file)
--- 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':