X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fwscript;h=9a3347be3cd0561d2d781209eb2996cb087b11a3;hp=946d628a2ef10acae5b80dc6a91973b274ac0415;hb=60adc5a3312a9412b8988a0e2e82724779b5b84e;hpb=4ead1f24f97edde9b6a77e47947cb188a551b49b

diff --git a/test/wscript b/test/wscript
index 946d628a2..9a3347be3 100644
--- a/test/wscript
+++ b/test/wscript
@@ -30,14 +30,12 @@ def configure(conf):
                             int main() {}
                             """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
 
-    conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=True)
-
 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 PNG '
-    obj.uselib += 'LEQM_NRT '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG '
+    obj.uselib += 'LEQM_NRT ZIP '
     if bld.env.TARGET_WINDOWS:
         obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     if bld.env.TARGET_LINUX:
@@ -45,6 +43,7 @@ def build(bld):
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
+                 atmos_test.cc
                  audio_analysis_test.cc
                  audio_buffers_test.cc
                  audio_delay_test.cc
@@ -87,15 +86,19 @@ def build(bld):
                  image_content_fade_test.cc
                  image_filename_sorter_test.cc
                  image_test.cc
+                 image_proxy_test.cc
                  import_dcp_test.cc
                  interrupt_encoder_test.cc
                  isdcf_name_test.cc
                  j2k_bandwidth_test.cc
                  job_test.cc
-                 make_black_test.cc
+                 kdm_naming_test.cc
+                 markers_test.cc
+                 no_use_video_test.cc
                  optimise_stills_test.cc
                  pixel_formats_test.cc
                  player_test.cc
+                 pulldown_detect_test.cc
                  ratio_test.cc
                  repeat_frame_test.cc
                  recover_test.cc
@@ -115,6 +118,7 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_charset_test.cc
+                 subtitle_metadata_test.cc
                  subtitle_reel_test.cc
                  subtitle_reel_number_test.cc
                  subtitle_trim_test.cc
@@ -127,6 +131,7 @@ def build(bld):
                  util_test.cc
                  vf_test.cc
                  video_content_scale_test.cc
+                 video_level_test.cc
                  video_mxf_content_test.cc
                  vf_kdm_test.cc
                  zipper_test.cc