X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=c91701e558ce1302c4fd32c60d54848c780f674d;hp=3a6d7d17467f17e2dccdf07502acf3764840dfaf;hb=4063260e52dafe5a75a321ff273dba182fd2f6a9;hpb=3fdf40334a7c3c04cb5f650f242633223452b423

diff --git a/test/test.cc b/test/test.cc
index 3a6d7d174..c91701e55 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -94,7 +94,13 @@ TestPaths::TestPaths::private_data ()
 		return boost::filesystem::path(env);
 	}
 
-	return boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+	auto relative = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
+	if (!boost::filesystem::exists(relative)) {
+		std::cerr << "No private test data found! Tests may fail.\n";
+		return relative;
+	}
+
+	return boost::filesystem::canonical(relative);
 }
 
 
@@ -110,7 +116,6 @@ setup_test_config ()
 	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2);
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
-	Config::instance()->set_default_container (Ratio::from_id ("185"));
 	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);
@@ -825,13 +830,15 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 boost::filesystem::path
 dcp_file (shared_ptr<const Film> film, string prefix)
 {
-	auto i = boost::filesystem::recursive_directory_iterator(film->dir(film->dcp_name()));
-	while (i != boost::filesystem::recursive_directory_iterator() && !boost::algorithm::starts_with(i->path().leaf().string(), prefix)) {
-		++i;
-	}
+	using namespace boost::filesystem;
+
+	vector<directory_entry> matches;
+	std::copy_if(recursive_directory_iterator(film->dir(film->dcp_name())), recursive_directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) {
+		return boost::algorithm::starts_with(entry.path().leaf().string(), prefix);
+	});
 
-	BOOST_REQUIRE_MESSAGE(i != boost::filesystem::recursive_directory_iterator(), "Could not find file with prefix " << prefix);
-	return i->path();
+	BOOST_REQUIRE_MESSAGE(matches.size() == 1, "Found " << matches.size() << " files with prefix " << prefix);
+	return matches[0].path();
 }
 
 boost::filesystem::path
@@ -935,7 +942,7 @@ make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code>
 	film->write_metadata ();
 	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
 	BOOST_REQUIRE (!wait_for_jobs());
-	auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd());
+	auto notes = dcp::verify({film->dir(film->dcp_name())}, &stage, &progress, {}, TestPaths::xsd());
 	bool ok = true;
 	for (auto i: notes) {
 		if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {