From: Carl Hetherington <cth@carlh.net>
Date: Sat, 13 Oct 2018 08:37:49 +0000 (+0100)
Subject: Fix test build.
X-Git-Tag: v2.13.60~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a62f4bbc26bb506f41d8143efebf0fb186bdfa5c

Fix test build.
---

diff --git a/cscript b/cscript
index 04d3746eb..043aba64c 100644
--- a/cscript
+++ b/cscript
@@ -335,8 +335,8 @@ 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
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
+        # Currently we only build tests on Ubuntu 1{6,8}.04
         opt += ' --disable-tests'
 
     if target.debug:
diff --git a/test/wscript b/test/wscript
index 8ef281dd7..24394971f 100644
--- a/test/wscript
+++ b/test/wscript
@@ -36,7 +36,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
-    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE MAGICK '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE MAGICK PNG '
     if bld.env.TARGET_WINDOWS:
         obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     obj.use    = 'libdcpomatic2'