X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fwscript;h=29f1e1db34ef884c44c80ab8d6722b03f18c27ee;hp=a7a406856c80b30b6b86a3c15b3c4109f08eb970;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=9c01623c3038b978ba732de2ad147d29fad60afe

diff --git a/test/wscript b/test/wscript
index a7a406856..29f1e1db3 100644
--- a/test/wscript
+++ b/test/wscript
@@ -30,83 +30,112 @@ 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 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 '
+    obj.uselib += 'LEQM_NRT ZIP '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2'
+        obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
+    if bld.env.TARGET_LINUX:
+        obj.uselib += 'DL '
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
                  audio_analysis_test.cc
                  audio_buffers_test.cc
                  audio_delay_test.cc
-                 audio_decoder_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
-                 dcp_subtitle_test.cc
+                 config_test.cc
+                 content_test.cc
+                 create_cli_test.cc
+                 crypto_test.cc
                  dcpomatic_time_test.cc
+                 dcp_decoder_test.cc
+                 dcp_playback_test.cc
+                 dcp_subtitle_test.cc
                  digest_test.cc
-                 ffmpeg_audio_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
                  file_log_test.cc
                  file_naming_test.cc
                  film_metadata_test.cc
+                 frame_interval_checker_test.cc
                  frame_rate_test.cc
+                 image_content_fade_test.cc
                  image_filename_sorter_test.cc
                  image_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
-                 player_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
-                 seek_zero_test.cc
                  silence_padding_test.cc
+                 shuffler_test.cc
                  skip_frame_test.cc
+                 socket_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
-                 video_decoder_fill_test.cc
-                 video_frame_test.cc
                  video_mxf_content_test.cc
-                 xml_subtitle_test.cc
+                 vf_kdm_test.cc
+                 zipper_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
+    # This one doesn't check anything
+    # resampler_test.cc
 
     obj.target = 'unit-tests'
     obj.install_path = ''