X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=a158ffca1049475915be70c4e906ea65f613f535;hb=7371f01c57d5f690c4175b1875d339fa5cbd49ae;hp=88df9177fb7834f8ffcc0065f51b87ea94713ee4;hpb=cd92063f7c67093ac789cb3aa78e534a3a85ef92;p=dcpomatic.git

diff --git a/test/wscript b/test/wscript
index 88df9177f..a158ffca1 100644
--- a/test/wscript
+++ b/test/wscript
@@ -30,14 +30,11 @@ 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')
 
-    if conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) is None:
-        conf.check_cfg(package='Magick++', 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 += '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 '
@@ -63,18 +60,22 @@ def build(bld):
                  colour_conversion_test.cc
                  config_test.cc
                  content_test.cc
+                 cpl_hash_test.cc
                  create_cli_test.cc
                  crypto_test.cc
                  dcpomatic_time_test.cc
                  dcp_decoder_test.cc
+                 dcp_metadata_test.cc
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc
                  digest_test.cc
-                 ecinema_kdm_test.cc
+                 empty_caption_test.cc
                  empty_test.cc
+                 encryption_test.cc
                  ffmpeg_audio_only_test.cc
                  ffmpeg_audio_test.cc
                  ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_error_test.cc
                  ffmpeg_decoder_seek_test.cc
                  ffmpeg_decoder_sequential_test.cc
                  ffmpeg_encoder_test.cc
@@ -86,18 +87,22 @@ def build(bld):
                  film_metadata_test.cc
                  frame_interval_checker_test.cc
                  frame_rate_test.cc
+                 hints_test.cc
                  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
                  kdm_naming_test.cc
-                 make_black_test.cc
+                 low_bitrate_test.cc
+                 markers_test.cc
                  no_use_video_test.cc
                  optimise_stills_test.cc
+                 overlap_video_test.cc
                  pixel_formats_test.cc
                  player_test.cc
                  pulldown_detect_test.cc
@@ -120,6 +125,8 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_charset_test.cc
+                 subtitle_language_test.cc
+                 subtitle_metadata_test.cc
                  subtitle_reel_test.cc
                  subtitle_reel_number_test.cc
                  subtitle_trim_test.cc
@@ -132,11 +139,18 @@ 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
+                 windows_test.cc
+                 writer_test.cc
                  zipper_test.cc
                  """
 
+    if bld.env.TARGET_LINUX and bld.env.ENABLE_DISK:
+        obj.source += " disk_writer_test.cc"
+        obj.uselib += "LWEXT4 NANOMSG "
+
     # Some difference in font rendering between the test machine and others...
     # burnt_subtitle_test.cc
     # This one doesn't check anything