X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=223f70b80e6983f4fc36bdbf0d95c54dbaeb8245;hb=2034cf8a82be21d4d07de81ae40c8255da1ed21e;hp=176f4ca675ed70d5b99b91538fceff53039683a2;hpb=e64a1a9aae0200d14feed49a4c6cf537bf5708a4;p=dcpomatic.git

diff --git a/test/wscript b/test/wscript
index 176f4ca67..223f70b80 100644
--- a/test/wscript
+++ b/test/wscript
@@ -19,14 +19,16 @@
 
 def configure(conf):
     boost_test_suffix=''
-    if conf.env.TARGET_WINDOWS:
-        boost_test_suffix='-mt'
+    if conf.env.TARGET_WINDOWS_64:
+        boost_test_suffix='-mt-x64'
+    elif conf.env.TARGET_WINDOWS_32:
+        boost_test_suffix='-mt-x32'
 
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #define BOOST_TEST_MODULE Config test\n
-    			    #include <boost/test/unit_test.hpp>\n
+                            #include <boost/test/unit_test.hpp>\n
                             int main() {}
                             """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
 
@@ -36,7 +38,7 @@ def build(bld):
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
     obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG '
     obj.uselib += 'LEQM_NRT ZIP '
-    if bld.env.TARGET_WINDOWS:
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'DL '
@@ -46,6 +48,7 @@ def build(bld):
                  atmos_test.cc
                  audio_analysis_test.cc
                  audio_buffers_test.cc
+                 audio_content_test.cc
                  audio_delay_test.cc
                  audio_filter_test.cc
                  audio_mapping_test.cc
@@ -60,18 +63,23 @@ def build(bld):
                  colour_conversion_test.cc
                  config_test.cc
                  content_test.cc
+                 cpl_hash_test.cc
                  create_cli_test.cc
                  crypto_test.cc
                  dcpomatic_time_test.cc
                  dcp_decoder_test.cc
+                 dcp_digest_file_test.cc
+                 dcp_metadata_test.cc
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc
                  digest_test.cc
-                 ecinema_kdm_test.cc
+                 empty_caption_test.cc
                  empty_test.cc
+                 encryption_test.cc
                  ffmpeg_audio_only_test.cc
                  ffmpeg_audio_test.cc
                  ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_error_test.cc
                  ffmpeg_decoder_seek_test.cc
                  ffmpeg_decoder_sequential_test.cc
                  ffmpeg_encoder_test.cc
@@ -83,6 +91,7 @@ def build(bld):
                  film_metadata_test.cc
                  frame_interval_checker_test.cc
                  frame_rate_test.cc
+                 hints_test.cc
                  image_content_fade_test.cc
                  image_filename_sorter_test.cc
                  image_test.cc
@@ -91,11 +100,14 @@ def build(bld):
                  interrupt_encoder_test.cc
                  isdcf_name_test.cc
                  j2k_bandwidth_test.cc
-                 job_test.cc
+                 job_manager_test.cc
+                 kdm_cli_test.cc
                  kdm_naming_test.cc
-                 make_black_test.cc
+                 low_bitrate_test.cc
+                 markers_test.cc
                  no_use_video_test.cc
                  optimise_stills_test.cc
+                 overlap_video_test.cc
                  pixel_formats_test.cc
                  player_test.cc
                  pulldown_detect_test.cc
@@ -118,8 +130,11 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_charset_test.cc
+                 subtitle_language_test.cc
+                 subtitle_metadata_test.cc
                  subtitle_reel_test.cc
                  subtitle_reel_number_test.cc
+                 subtitle_timing_test.cc
                  subtitle_trim_test.cc
                  test.cc
                  threed_test.cc
@@ -133,9 +148,15 @@ def build(bld):
                  video_level_test.cc
                  video_mxf_content_test.cc
                  vf_kdm_test.cc
+                 windows_test.cc
+                 writer_test.cc
                  zipper_test.cc
                  """
 
+    if bld.env.TARGET_LINUX and bld.env.ENABLE_DISK:
+        obj.source += " disk_writer_test.cc"
+        obj.uselib += "LWEXT4 NANOMSG "
+
     # Some difference in font rendering between the test machine and others...
     # burnt_subtitle_test.cc
     # This one doesn't check anything