From: Carl Hetherington <cth@carlh.net>
Date: Mon, 9 Oct 2023 22:50:57 +0000 (+0200)
Subject: Switch to testing on Ubuntu 16.04 and 22.04.
X-Git-Tag: v1.8.84~5
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=dfc34502469e9c975bf78011b0efc365c11e9779;p=libdcp.git

Switch to testing on Ubuntu 16.04 and 22.04.
---

diff --git a/cscript b/cscript
index f7e8e1bf..ab52e4d3 100644
--- a/cscript
+++ b/cscript
@@ -41,8 +41,8 @@ def build(target, options):
     cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
     if target.platform == 'linux':
         cmd += ' --static'
-        if not (target.distro == 'ubuntu' and target.version == '18.04'):
-            # We only build tests on Ubuntu 18.04
+        if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
+            # We only build tests on Ubuntu 16.04 and 22.04
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'