Better information when check_audio_file fails.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index b70e2354e9fd7a13304fd62f5393f9359b371eed..791154077f21585a3f3fa63980cde82fedb14a1d 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -28,9 +28,10 @@
 #include "lib/job_manager.h"
 #include "lib/job.h"
 #include "lib/cross.h"
-#include "lib/server_finder.h"
+#include "lib/encode_server_finder.h"
 #include "lib/image.h"
 #include "lib/ratio.h"
+#include "lib/log_entry.h"
 #include <dcp/dcp.h>
 #include <sndfile.h>
 #include <libxml++/libxml++.h>
@@ -40,6 +41,7 @@
 #include <boost/test/unit_test.hpp>
 #include <list>
 #include <vector>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -76,8 +78,9 @@ struct TestConfig
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
                Config::instance()->set_default_j2k_bandwidth (100000000);
+               Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
-               ServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->disable ();
 
                signal_manager = new TestSignalManager ();
        }
@@ -148,6 +151,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
                        BOOST_REQUIRE_MESSAGE (
                                abs (ref_buffer[i] - check_buffer[i]) <= 65536,
                                ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
+                               << "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")"
                                );
                }
 
@@ -291,12 +295,10 @@ wait_for_jobs ()
 {
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
-               signal_manager->ui_idle ();
+               while (signal_manager->ui_idle ()) {}
                dcpomatic_sleep (1);
        }
 
-       cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n";
-
        if (jm->errors ()) {
                int N = 0;
                for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@ -315,13 +317,10 @@ wait_for_jobs ()
                }
        }
 
-       signal_manager->ui_idle ();
+       while (signal_manager->ui_idle ()) {}
 
        if (jm->errors ()) {
-               cout << "Dropping JobManager\n";
                JobManager::drop ();
-       } else {
-               cout << "Not dropping JobManager\n";
        }
 }