X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=c57f76e61c7f98a97effb69622a682308a81ea35;hb=02cc8c7680381c123a31c23a43f6b34a04c2115a;hp=b70e2354e9fd7a13304fd62f5393f9359b371eed;hpb=96f06076d51f6ca57b261a25c0d7f2e3f1852250;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index b70e2354e..c57f76e61 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -28,9 +29,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 +42,7 @@
 #include <boost/test/unit_test.hpp>
 #include <list>
 #include <vector>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -76,8 +79,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 +152,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] << ")"
 				);
 		}
 
@@ -286,17 +291,15 @@ check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
 	check_xml (ref_root, test_root, ignore);
 }
 
-void
+bool
 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,14 +318,14 @@ 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";
+		return true;
 	}
+
+	return false;
 }
 
 void