Merge master.

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index 3c7484fcdb48f17521bbf626fa8544785d8de2dd..ba5aabb7c333243fb8009ad22b08c8bb25b57096 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -12,13 +12,13 @@ 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.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
     obj.use    = 'libdcpomatic'
     obj.source = """
                  4k_test.cc
                  audio_analysis_test.cc
                  audio_delay_test.cc
-                 audio_merger_test.cc
+                 audio_mapping_test.cc
                  black_fill_test.cc
                  client_server_test.cc
                  colour_conversion_test.cc
@@ -26,7 +26,6 @@ def build(bld):
                  ffmpeg_dcp_test.cc
                  ffmpeg_examiner_test.cc
                  ffmpeg_pts_offset.cc
-                 ffmpeg_seek_test.cc
                  file_group_test.cc
                  film_metadata_test.cc
                  frame_rate_test.cc
@@ -34,15 +33,16 @@ def build(bld):
                  job_test.cc
                  make_black_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
                  silence_padding_test.cc
                  skip_frame_test.cc
                  stream_test.cc
+                 subrip_test.cc
                  test.cc
                  threed_test.cc
                  util_test.cc
@@ -57,7 +57,6 @@ def build(bld):
     obj.use    = 'libdcpomatic'
     obj.source = """
                  test.cc
-                 long_ffmpeg_seek_test.cc
                  """
 
     obj.target = 'long-unit-tests'