Merge master.

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index 8cc50a683e33b2a76aa4ce702ea246aadc82dd27..ba5aabb7c333243fb8009ad22b08c8bb25b57096 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -10,35 +10,54 @@ def configure(conf):
                               """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
 
 def build(bld):
-    obj = bld(features = 'cxx cxxprogram')
+    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 = """
-                 test.cc
+                 4k_test.cc
+                 audio_analysis_test.cc
                  audio_delay_test.cc
-                 silence_padding_test.cc
-                 audio_merger_test.cc
-                 resampler_test.cc
+                 audio_mapping_test.cc
+                 black_fill_test.cc
+                 client_server_test.cc
+                 colour_conversion_test.cc
                  ffmpeg_audio_test.cc
-                 threed_test.cc
-                 play_test.cc
-                 frame_rate_test.cc
-                 ffmpeg_pts_offset.cc
+                 ffmpeg_dcp_test.cc
                  ffmpeg_examiner_test.cc
-                 black_fill_test.cc
-                 scaling_test.cc
-                 ratio_test.cc
-                 pixel_formats_test.cc
-                 make_black_test.cc
+                 ffmpeg_pts_offset.cc
+                 file_group_test.cc
                  film_metadata_test.cc
+                 frame_rate_test.cc
+                 image_test.cc
+                 job_test.cc
+                 make_black_test.cc
+                 pixel_formats_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
-                 ffmpeg_dcp_test.cc
-                 job_test.cc
-                 client_server_test.cc
-                 image_test.cc
-                 4k_test.cc
                  """
+
     obj.target = 'unit-tests'
     obj.install_path = ''
+
+    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.source = """
+                 test.cc
+                 """
+
+    obj.target = 'long-unit-tests'
+    obj.install_path = ''