Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index 493836a7ab3fd747a300476ebd1cd64980876d36..16e84f2314c1765802ae036833cb5f9f788939a8 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -12,7 +12,10 @@ 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 MAGICK'
+    obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE DCP OPENJPEG CAIROMM PANGOMM XMLPP '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL '
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += 'WINSOCK2'
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
@@ -23,7 +26,6 @@ def build(bld):
                  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
@@ -34,8 +36,10 @@ def build(bld):
                  ffmpeg_examiner_test.cc
                  ffmpeg_pts_offset_test.cc
                  file_group_test.cc
+                 file_log_test.cc
                  film_metadata_test.cc
                  frame_rate_test.cc
+                 image_filename_sorter_test.cc
                  image_test.cc
                  import_dcp_test.cc
                  isdcf_name_test.cc
@@ -52,24 +56,19 @@ def build(bld):
                  silence_padding_test.cc
                  skip_frame_test.cc
                  stream_test.cc
-                 subrip_test.cc
                  test.cc
                  threed_test.cc
+                 update_checker_test.cc
                  upmixer_a_test.cc
                  util_test.cc
+                 video_content_scale_test.cc
+                 video_decoder_fill_test.cc
                  xml_subtitle_test.cc
                  """
 
-    obj.target = 'unit-tests'
-    obj.install_path = ''
+    # Disabled tests: some difference in font rendering between the test machine
+    # and others...
+    # subrip_test.cc burnt_subtitle_test.cc
 
-    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    = 'libdcpomatic2'
-    obj.source = """
-                 test.cc
-                 """
-
-    obj.target = 'long-unit-tests'
+    obj.target = 'unit-tests'
     obj.install_path = ''