X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=test%2Fwscript;h=055dc9def0d619ac6dc5a08628bf0b81233e08d8;hb=5ce9c7026366d82233e8852b9b949362ed2f6191;hp=1593aac99bceb236a034f5b9ce39f5451c1d8085;hpb=58f0530b1687673ea6e24a083063c3fdf2bff0b2;p=dcpomatic.git

diff --git a/test/wscript b/test/wscript
index 1593aac99..055dc9def 100644
--- a/test/wscript
+++ b/test/wscript
@@ -1,3 +1,21 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
 def configure(conf):
     boost_test_suffix=''
     if conf.env.TARGET_WINDOWS:
@@ -12,7 +30,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 SUB'
+    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 SSH XMLSEC '
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += 'WINSOCK2'
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
@@ -23,7 +44,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
@@ -37,6 +57,7 @@ def build(bld):
                  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,26 +73,22 @@ def build(bld):
                  seek_zero_test.cc
                  silence_padding_test.cc
                  skip_frame_test.cc
+                 srt_subtitle_test.cc
                  stream_test.cc
-                 subrip_test.cc
                  test.cc
                  threed_test.cc
+                 time_calculation_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 = ''
-
-    obj = bld(features='cxx cxxprogram')
-    obj.name   = 'long-unit-tests'
-    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML SUB'
-    obj.use    = 'libdcpomatic2'
-    obj.source = """
-                 test.cc
-                 """
+    # Disabled tests: some difference in font rendering between the test machine
+    # and others...
+    # subrip_test.cc burnt_subtitle_test.cc
 
-    obj.target = 'long-unit-tests'
+    obj.target = 'unit-tests'
     obj.install_path = ''