X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=1c7b7e245c11e967cf59dd8f02e497aa67cd3212;hb=85986ebc99aaae8507d889a027da6e3177e1348b;hp=b5142bd63fc95c20b07ee0db0f4c6a923481bd98;hpb=9418f546ef17f17f84e4a348a08c1acf34542249;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index b5142bd63..1c7b7e245 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -17,45 +17,27 @@
 
 */
 
-#include <fstream>
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/date_time.hpp>
+#include <vector>
+#include <list>
 #include <libdcp/dcp.h>
-#include "ratio.h"
-#include "film.h"
-#include "filter.h"
-#include "job_manager.h"
-#include "util.h"
-#include "exceptions.h"
-#include "image.h"
-#include "log.h"
-#include "dcp_video_frame.h"
-#include "config.h"
-#include "server.h"
-#include "cross.h"
-#include "job.h"
-#include "scaler.h"
-#include "ffmpeg_decoder.h"
-#include "sndfile_decoder.h"
-#include "dcp_content_type.h"
-#include "ui_signaller.h"
-#include "ratio.h"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/ui_signaller.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/job.h"
+#include "lib/cross.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using std::list;
-using std::stringstream;
 using std::vector;
 using std::min;
 using std::cout;
 using std::cerr;
+using std::list;
 using boost::shared_ptr;
-using boost::thread;
-using boost::dynamic_pointer_cast;
 
 struct TestConfig
 {
@@ -64,7 +46,7 @@ struct TestConfig
 		dcpomatic_setup();
 
 		Config::instance()->set_num_local_encoding_threads (1);
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		Config::instance()->set_servers (vector<ServerDescription> ());
 		Config::instance()->set_server_port (61920);
 		Config::instance()->set_default_dci_metadata (DCIMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
@@ -76,7 +58,7 @@ struct TestConfig
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
 
-static boost::filesystem::path
+boost::filesystem::path
 test_film_dir (string name)
 {
 	boost::filesystem::path p;
@@ -86,7 +68,7 @@ test_film_dir (string name)
 	return p;
 }
 
-static shared_ptr<Film>
+shared_ptr<Film>
 new_test_film (string name)
 {
 	boost::filesystem::path p = test_film_dir (name);
@@ -137,7 +119,7 @@ note (libdcp::NoteType, string n)
 	cout << n << "\n";
 }
 
-static void
+void
 check_dcp (string ref, string check)
 {
 	libdcp::DCP ref_dcp (ref);
@@ -162,29 +144,15 @@ wait_for_jobs ()
 	while (jm->work_to_do ()) {}
 	if (jm->errors ()) {
 		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
-			cerr << (*i)->error_summary () << "\n"
-			     << (*i)->error_details () << "\n";
+			if ((*i)->finished_in_error ()) {
+				cerr << (*i)->error_summary () << "\n"
+				     << (*i)->error_details () << "\n";
+			}
 		}
 	}
 		
 	BOOST_CHECK (!jm->errors());
-}
 
-#include "play_test.cc"
-#include "frame_rate_test.cc"
-#include "silence_padding_test.cc"
-#include "audio_delay_test.cc"
-#include "ffmpeg_pts_offset.cc"
-#include "ffmpeg_examiner_test.cc"
-#include "black_fill_test.cc"
-#include "scaling_test.cc"
-#include "ratio_test.cc"
-#include "pixel_formats_test.cc"
-#include "make_black_test.cc"
-#include "film_metadata_test.cc"
-#include "stream_test.cc"
-#include "util_test.cc"
-#include "ffmpeg_dcp_test.cc"
-#include "job_test.cc"
-#include "client_server_test.cc"
-#include "image_test.cc"
+	/* Hack: wait for ui_signaller signals to fire */
+	dcpomatic_sleep (1);
+}