Merge master; fix crash on new film.

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index 7ea02a80471debcb6202b1297c07cce205cef7c1..61c391663496477306d0cfe24674c622f8081a7b 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -1,16 +1,15 @@
-def build(bld):
-    obj = bld(features = 'cxx cxxprogram')
-    obj.name   = 'short-unit-tests'
-    obj.uselib = 'BOOST_TEST'
-    obj.use    = 'libdvdomatic'
-    obj.source = 'short.cc'
-    obj.target = 'short-unit-tests'
-    obj.install_path = ''
+def configure(conf):
+    conf.check_cxx(fragment = """
+                              #define BOOST_TEST_MODULE Config test\n
+                             #include <boost/test/unit_test.hpp>\n
+                              int main() {}
+                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework-mt', uselib_store = 'BOOST_TEST')
 
+def build(bld):
     obj = bld(features = 'cxx cxxprogram')
-    obj.name   = 'long-unit-tests'
-    obj.uselib = 'BOOST_TEST'
-    obj.use    = 'libdvdomatic'
-    obj.source = 'long.cc'
-    obj.target = 'long-unit-tests'
+    obj.name   = 'unit-tests'
+    obj.uselib = 'BOOST_TEST CXML DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+    obj.use    = 'libdcpomatic'
+    obj.source = 'test.cc'
+    obj.target = 'unit-tests'
     obj.install_path = ''