Add failing test for one short-reel possibility.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 50770a6875ce2e2f05f9685f2319eb2fdc651d40..b111a3b6b85a62dfe591e81aac2c78c2aae822b1 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>

 
     This file is part of DCP-o-matic.
 
 
     This file is part of DCP-o-matic.
 


@@ -35,6 +35,8 @@
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
 #include "lib/compose.hpp"
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
 #include "lib/compose.hpp"

+#include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"

 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>


@@ -70,6 +72,7 @@ using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
 boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
 using boost::dynamic_pointer_cast;
 
 boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));

+boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));

 
 void
 setup_test_config ()
 
 void
 setup_test_config ()


@@ -113,6 +116,8 @@ struct TestConfig
                if (env_private) {
                        private_data = env_private;
                }
                if (env_private) {
                        private_data = env_private;
                }

+
+               dcpomatic_log.reset (new FileLog("build/test/log"));

        }
 
        ~TestConfig ()
        }
 
        ~TestConfig ()


@@ -385,7 +390,7 @@ wait_for_jobs ()
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
                while (signal_manager->ui_idle ()) {}
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
                while (signal_manager->ui_idle ()) {}

-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);

        }
 
        if (jm->errors ()) {
        }
 
        if (jm->errors ()) {


@@ -417,11 +422,11 @@ wait_for_jobs ()
 }
 
 void
 }
 
 void

-write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format)
+write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type)

 {
        using namespace MagickCore;
 
 {
        using namespace MagickCore;
 

-       Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
+       Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]);

        m.write (file.string ());
 }
 
        m.write (file.string ());
 }