Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index ec61915a6254c429b974cb74720e306cf35a9b87..493836a7ab3fd747a300476ebd1cd64980876d36 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -12,17 +12,21 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST BOOST_THREAD 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'
+    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
                  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
@@ -33,9 +37,11 @@ def build(bld):
                  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_silence_padding_test.cc
+                 player_test.cc
                  pixel_formats_test.cc
                  ratio_test.cc
                  repeat_frame_test.cc
@@ -49,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'
@@ -58,7 +66,7 @@ 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.use    = 'libdcpomatic2'
     obj.source = """
                  test.cc
                  """