X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=93c994741f50e4926993ed8e4b2c7fe84396ea35;hb=cde792116ecae3d61f9b724fc581fdf82f30a0a9;hp=4bb6551d39b1400dd17f14f1ee6404bdaaa50bb4;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 4bb6551d3..93c994741 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -20,28 +20,28 @@
 
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
+ *  @ingroup specific
  */
 
+#include <boost/test/unit_test.hpp>
 #include "lib/image_content.h"
 #include "lib/ratio.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
 
 static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
 {
 	content->video->set_scale (VideoContentScale (Ratio::from_id (image)));
 	film->set_container (Ratio::from_id (container));
+	film->set_interop (false);
 	film->make_dcp ();
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path ref;
 	ref = "test";
@@ -62,11 +62,11 @@ BOOST_AUTO_TEST_CASE (scaling_test)
 	shared_ptr<Film> film = new_test_film ("scaling_test");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_name ("scaling_test");
-	shared_ptr<ImageContent> imc = make_shared<ImageContent> (film, "test/data/simple_testcard_640x480.png");
+	shared_ptr<ImageContent> imc (new ImageContent("test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (imc);
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	imc->video->set_length (1);