From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 Feb 2021 23:13:37 +0000 (+0100)
Subject: Revert "Build tests on ubuntu 16.04."
X-Git-Tag: v2.15.127~5
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f6e5596160d68802b7bb75d987cb99e3290df4c3

Revert "Build tests on ubuntu 16.04."

This reverts commit 93c2ca7dfc8feeae374c867c1c679334571a7547.

Building the tests on 16.04 needs a newer boost than it provides;
you can build it statically but then you need to link the boost test
library statically (which requires the removal of BOOST_TEST_DYN_LINK
all over the place).  Doing that fails in libsub for some reason.
---

diff --git a/cscript b/cscript
index 41f98b135..7b593c8cb 100644
--- a/cscript
+++ b/cscript
@@ -390,10 +390,10 @@ option_defaults = { "gui": True, "variant": None }
 def configure_options(target, options):
     opt = ' --warnings-are-errors'
 
-    if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ('16.04', '18.04')) or
+    if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
             (target.platform == 'osx') or
             (target.platform == 'windows')):
-        # Currently we only build tests on Ubuntu {16,18}.04, macOS and Windows
+        # Currently we only build tests on Ubuntu 18.04, macOS and Windows
         opt += ' --disable-tests'
 
     if target.debug: