Merge master.

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index de9e9f25a41a8c66f4e22783f59cf3092112a328..371ea7a539cbed4c43214409ed31b76f14920002 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -12,32 +12,40 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
-    obj.use    = 'libdcpomatic'
+    obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB'
+    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
                  black_fill_test.cc
+                 burnt_subtitle_test.cc
                  client_server_test.cc
                  colour_conversion_test.cc
+                 dcp_subtitle_test.cc
                  ffmpeg_audio_test.cc
                  ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_seek_test.cc
+                 ffmpeg_decoder_sequential_test.cc
                  ffmpeg_examiner_test.cc
-                 ffmpeg_pts_offset.cc
-                 ffmpeg_seek_test.cc
+                 ffmpeg_pts_offset_test.cc
                  file_group_test.cc
                  film_metadata_test.cc
                  frame_rate_test.cc
                  image_test.cc
+                 import_dcp_test.cc
+                 isdcf_name_test.cc
                  job_test.cc
                  make_black_test.cc
+                 player_test.cc
                  pixel_formats_test.cc
-                 play_test.cc
                  ratio_test.cc
                  repeat_frame_test.cc
+                 recover_test.cc
                  resampler_test.cc
                  scaling_test.cc
                  seek_zero_test.cc
@@ -47,7 +55,9 @@ def build(bld):
                  subrip_test.cc
                  test.cc
                  threed_test.cc
+                 upmixer_a_test.cc
                  util_test.cc
+                 xml_subtitle_test.cc
                  """
 
     obj.target = 'unit-tests'
@@ -55,11 +65,10 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'long-unit-tests'
-    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
-    obj.use    = 'libdcpomatic'
+    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML SUB'
+    obj.use    = 'libdcpomatic2'
     obj.source = """
                  test.cc
-                 long_ffmpeg_seek_test.cc
                  """
 
     obj.target = 'long-unit-tests'