X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=1d2fafc02627c96a53a331d342c167fbaa4bec1c;hb=ab0e8cdcafdcb83096012380f674b8280474e851;hp=cfc114937adea67bb4c36a1d8a81abe8cb187619;hpb=130577d2e4e67de15ac8f5d6447729736d4bcac6;p=dcpomatic.git

diff --git a/test/wscript b/test/wscript
index cfc114937..1d2fafc02 100644
--- a/test/wscript
+++ b/test/wscript
@@ -30,13 +30,15 @@ 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 MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE '
+    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 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE '
+        obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
@@ -45,15 +47,31 @@ def build(bld):
                  audio_delay_test.cc
                  audio_filter_test.cc
                  audio_mapping_test.cc
+                 audio_merger_test.cc
                  audio_processor_test.cc
                  audio_processor_delay_test.cc
-                 black_fill_test.cc
+                 audio_ring_buffers_test.cc
+                 butler_test.cc
+                 cinema_sound_processor_test.cc
                  client_server_test.cc
+                 closed_caption_test.cc
                  colour_conversion_test.cc
+                 config_test.cc
+                 content_test.cc
+                 create_cli_test.cc
+                 crypto_test.cc
                  dcpomatic_time_test.cc
+                 dcp_playback_test.cc
+                 dcp_subtitle_test.cc
                  digest_test.cc
+                 ecinema_kdm_test.cc
+                 empty_test.cc
+                 ffmpeg_audio_only_test.cc
                  ffmpeg_audio_test.cc
                  ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_seek_test.cc
+                 ffmpeg_decoder_sequential_test.cc
+                 ffmpeg_encoder_test.cc
                  ffmpeg_examiner_test.cc
                  ffmpeg_pts_offset_test.cc
                  file_group_test.cc
@@ -61,6 +79,7 @@ def build(bld):
                  file_naming_test.cc
                  film_metadata_test.cc
                  frame_rate_test.cc
+                 image_content_fade_test.cc
                  image_filename_sorter_test.cc
                  image_test.cc
                  import_dcp_test.cc
@@ -69,25 +88,36 @@ def build(bld):
                  j2k_bandwidth_test.cc
                  job_test.cc
                  make_black_test.cc
+                 optimise_stills_test.cc
                  pixel_formats_test.cc
+                 player_test.cc
                  ratio_test.cc
                  repeat_frame_test.cc
                  recover_test.cc
                  rect_test.cc
                  reels_test.cc
+                 reel_writer_test.cc
                  required_disk_space_test.cc
+                 remake_id_test.cc
+                 remake_with_subtitle_test.cc
                  render_subtitles_test.cc
-                 resampler_test.cc
                  scaling_test.cc
                  silence_padding_test.cc
+                 shuffler_test.cc
                  skip_frame_test.cc
                  srt_subtitle_test.cc
                  ssa_subtitle_test.cc
                  stream_test.cc
+                 subtitle_charset_test.cc
+                 subtitle_reel_test.cc
+                 subtitle_reel_number_test.cc
+                 subtitle_trim_test.cc
                  test.cc
                  threed_test.cc
                  time_calculation_test.cc
+                 torture_test.cc
                  update_checker_test.cc
+                 upmixer_a_test.cc
                  util_test.cc
                  vf_test.cc
                  video_content_scale_test.cc
@@ -95,21 +125,10 @@ def build(bld):
                  vf_kdm_test.cc
                  """
 
-    # Disabled tests: some difference in font rendering between the test machine
-    # and others...
+    # Some difference in font rendering between the test machine and others...
     # burnt_subtitle_test.cc
-
-    # XXX
-    # audio_decoder_test.cc
-    # dcp_subtitle_test.cc
-    # ffmpeg_audio_only_test.cc
-    # ffmpeg_decoder_seek_test.cc
-    # ffmpeg_decoder_sequential_test.cc
-    # silence_padding_test.cc
-    # player_test.cc
-    # seek_zero_test.cc
-    # upmixer_a_test.cc
-    # video_decoder_fill_test.cc
+    # This one doesn't check anything
+    # resampler_test.cc
 
     obj.target = 'unit-tests'
     obj.install_path = ''