Stop jobs silently failing in tests.

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 82c5a2583ef64fbd4ef100d8997a1c94e885bd89..71d60f5732e10106a721b02ebf016b1cc9d8612f 100644 (file)
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -48,12 +48,12 @@ BOOST_AUTO_TEST_CASE (fourk_test)
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->examine_and_add_content (c);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->make_dcp ();
 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path p (test_film_dir ("4k_test"));
        p /= film->dcp_name ();
 
        boost::filesystem::path p (test_film_dir ("4k_test"));
        p /= film->dcp_name ();

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 2fbaef7eaeab7c982ec6be08bcc419ab67cf8534..a2da8d6900122d7bc9156173216f147f608e2a57 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -114,12 +114,12 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 
        shared_ptr<FFmpegContent> c (new FFmpegContent(p));
        film->examine_and_add_content (c);
 
        shared_ptr<FFmpegContent> c (new FFmpegContent(p));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 }
 
 /** Check that audio analysis works (i.e. runs without error) with a -ve delay */
 }
 
 /** Check that audio analysis works (i.e. runs without error) with a -ve delay */


@@ -129,14 +129,14 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
        film->set_name ("audio_analysis_negative_delay_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (c);
        film->set_name ("audio_analysis_negative_delay_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->audio->set_delay (-250);
 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
 
        c->audio->set_delay (-250);
 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 }
 
 /** Check audio analysis that is incorrect in 2e98263 */
 }
 
 /** Check audio analysis that is incorrect in 2e98263 */


@@ -146,12 +146,12 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
        film->set_name ("audio_analysis_test2");
        shared_ptr<FFmpegContent> c (new FFmpegContent(private_data / "3d_thx_broadway_2010_lossless.m2ts"));
        film->examine_and_add_content (c);
        film->set_name ("audio_analysis_test2");
        shared_ptr<FFmpegContent> c (new FFmpegContent(private_data / "3d_thx_broadway_2010_lossless.m2ts"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
 
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 }
 
 
 }
 
 


@@ -175,12 +175,12 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/white.wav"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/white.wav"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->set_audio_channels (12);
        boost::signals2::connection connection;
        JobManager::instance()->analyse_audio (film, film->playlist(), false, connection, boost::bind (&analysis_finished));
 
        film->set_audio_channels (12);
        boost::signals2::connection connection;
        JobManager::instance()->analyse_audio (film, film->playlist(), false, connection, boost::bind (&analysis_finished));

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        BOOST_CHECK (done);
 }
 
        BOOST_CHECK (done);
 }
 


@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
        film->set_name ("frobozz");
        shared_ptr<Content> content = content_factory(private_data / "20 The Wedding Convoy Song.m4a").front();
        film->examine_and_add_content (content);
        film->set_name ("frobozz");
        shared_ptr<Content> content = content_factory(private_data / "20 The Wedding Convoy Song.m4a").front();
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<Playlist> playlist (new Playlist);
        playlist->add (film, content);
 
        shared_ptr<Playlist> playlist (new Playlist);
        playlist->add (film, content);

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index d486364f20f68c0678f2cbbb007dcb538292c3b5..9e738d14524248f6819cf5a2b51fe2fca0fe9433 100644 (file)
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -60,11 +60,11 @@ void test_audio_delay (int delay_in_ms)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        content->audio->set_delay (delay_in_ms);
 
        film->make_dcp ();
        content->audio->set_delay (delay_in_ms);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path path = "build/test";
        path /= film_name;
 
        boost::filesystem::path path = "build/test";
        path /= film_name;

diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index 9c790833ca904dcd33a7bb7b390dfa69b9286532..4e917bd45bbad300c84e8bfcec3ee2bf0ec4b18f 100644 (file)
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (audio_processor_test)
        film->set_name ("audio_processor_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/white.wav"));
        film->examine_and_add_content (c);
        film->set_name ("audio_processor_test");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/white.wav"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->set_audio_channels (6);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
        film->set_audio_channels (6);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));


@@ -50,10 +50,10 @@ BOOST_AUTO_TEST_CASE (audio_processor_test)
        /* Analyse the audio and check it doesn't crash */
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        JobManager::instance()->add (job);
        /* Analyse the audio and check it doesn't crash */
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        JobManager::instance()->add (job);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Make a DCP and check it */
        film->make_dcp ();
 
        /* Make a DCP and check it */
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        check_dcp ("test/data/audio_processor_test", film->dir (film->dcp_name ()));
 }
        check_dcp ("test/data/audio_processor_test", film->dir (film->dcp_name ()));
 }

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 40dac675638c4d18a4771e5dc31c87f1ef2e705a..91edcad9f46c4113080965a1c8746647a2bb60cd 100644 (file)
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -63,9 +63,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
        content->subtitle->set_use (true);
        content->subtitle->set_burn (true);
        film->examine_and_add_content (content);
        content->subtitle->set_use (true);
        content->subtitle->set_burn (true);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->make_dcp ();
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
 }
 
        check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
 }


@@ -80,9 +80,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
        shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
        content->subtitle->set_use (true);
        film->examine_and_add_content (content);
        shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
        content->subtitle->set_use (true);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->make_dcp ();
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
 }
 
        check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
 }

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index afefbac589d4916381eb5997b2934fec2630f657..04a0eabe3f5474fdbd84e04c6148ee4f65fffb88 100644 (file)
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
        shared_ptr<Film> film = new_test_film ("dcp_playback_test");
        shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
        film->examine_and_add_content (content);
        shared_ptr<Film> film = new_test_film ("dcp_playback_test");
        shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<Butler> butler (
                new Butler(
 
        shared_ptr<Butler> butler (
                new Butler(

diff --git a/test/digest_test.cc b/test/digest_test.cc
index a3fd6c81b89e0ed5bc948b046783ee2e595783e6..68e443779c1228330b1f35615e8f9bec804d8718 100644 (file)
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -70,11 +70,11 @@ BOOST_AUTO_TEST_CASE (digest_test)
        film->examine_and_add_content (g);
        film->examine_and_add_content (b);
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->examine_and_add_content (g);
        film->examine_and_add_content (b);
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        Config::instance()->set_master_encoding_threads (4);
        film->make_dcp ();
 
        Config::instance()->set_master_encoding_threads (4);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        Config::instance()->set_master_encoding_threads (1);
 
        dcp::DCP dcp (film->dir (film->dcp_name ()));
        Config::instance()->set_master_encoding_threads (1);
 
        dcp::DCP dcp (film->dir (film->dcp_name ()));

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 890185267d7a61636375396d6f7c4f7cdf25ee26..86ce2075c06c31535b448e90c71b9dd9a7e15ffc 100644 (file)
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        int const vfr = film->video_frame_rate ();
 
 
        int const vfr = film->video_frame_rate ();
 


@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        int const vfr = film->video_frame_rate ();
 
 
        int const vfr = film->video_frame_rate ();
 

diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index 8e2993e9650ebf1d75bbc568762e7d8f3688440d..a8a7184c4e264883b7de730afec4adc3cc4c073c 100644 (file)
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -74,12 +74,12 @@ test (boost::filesystem::path file)
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        shared_ptr<FFmpegContent> c (new FFmpegContent(file));
        film->examine_and_add_content (c);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        shared_ptr<FFmpegContent> c (new FFmpegContent(file));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->write_metadata ();
 
        /* See if can make a DCP without any errors */
        film->make_dcp ();
        film->write_metadata ();
 
        /* See if can make a DCP without any errors */
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        BOOST_CHECK (!JobManager::instance()->errors());
 
        /* Compare the audio data player reads with what libsndfile reads */
        BOOST_CHECK (!JobManager::instance()->errors());
 
        /* Compare the audio data player reads with what libsndfile reads */

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 7a21ced06f14150840e2eba3325910c607fc9d60..067075d254a2650809c447a6639caf6f2d31cfa2 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent ("test/data/staircase.mov"));
        film->examine_and_add_content (c);
 
        shared_ptr<FFmpegContent> c (new FFmpegContent ("test/data/staircase.mov"));
        film->examine_and_add_content (c);
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 


@@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        film->make_dcp ();
        film->write_metadata ();
 
        film->make_dcp ();
        film->write_metadata ();
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path path = "build/test";
        path /= "ffmpeg_audio_test";
 
        boost::filesystem::path path = "build/test";
        path /= "ffmpeg_audio_test";

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index b8bfe3532d144d6f54df28f3e705a7b8d9c57783..c69c74c685c5422f38d33d8391b4a06ba64a4b9b 100644 (file)
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -72,7 +72,7 @@ test (boost::filesystem::path file, vector<int> frames)
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
        shared_ptr<FFmpegContent> content (new FFmpegContent (path));
        film->examine_and_add_content (content);
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
        shared_ptr<FFmpegContent> content (new FFmpegContent (path));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
        decoder->video->Data.connect (bind (&store, _1));
 
        shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
        decoder->video->Data.connect (bind (&store, _1));
 

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 50c96afed6e3cdd0c2a032500817581cb3f4e259..892bc9e4c0909978f4c47be157cda4867badadde 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -63,7 +63,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
        shared_ptr<FFmpegContent> content (new FFmpegContent(path));
        film->examine_and_add_content (content);
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
        shared_ptr<FFmpegContent> content (new FFmpegContent(path));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->write_metadata ();
        shared_ptr<Log> log (new NullLog);
        shared_ptr<Player> player (new Player (film, film->playlist()));
        film->write_metadata ();
        shared_ptr<Log> log (new NullLog);
        shared_ptr<Player> player (new Player (film, film->playlist()));

diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 1d36192194e597bb96e117802fffe44f20609cbb..18f89713e756d85e7ed529c434ad118f39811c92 100644 (file)
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
        shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
        shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/test.mp4"));
        film->examine_and_add_content (content);
        shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
        shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/test.mp4"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->audio.reset (new AudioContent (content.get()));
        content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
 
        content->audio.reset (new AudioContent (content.get()));
        content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index f06fdfa42fa211f6fa2f85353e56cecce9b44153..6b5b2020d77aba32120dee7e7264ba15526758b3 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -65,11 +65,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        int got[3] = { 0, 0, 0 };
        for (
 
        int got[3] = { 0, 0, 0 };
        for (


@@ -104,11 +104,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
        film->examine_and_add_content (g);
        shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        int got[3] = { 0, 0, 0 };
        for (
 
        int got[3] = { 0, 0, 0 };
        for (

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index af04e1a093ccf4d6bafa8f1bf956c7e01c15c17a..0a31294581eea490bb6608c529a8d23edbd57b1f 100644 (file)
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Run some tests with a limited range of allowed rates */
 
 
        /* Run some tests with a limited range of allowed rates */
 


@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
        film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (B);
        film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (B);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Run some tests with a limited range of allowed rates */
 
 
        /* Run some tests with a limited range of allowed rates */
 


@@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        std::list<int> afr;
        afr.push_back (24);
 
        std::list<int> afr;
        afr.push_back (24);

diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc
index a3f093204cb37549f94cf4c76b421ecdeb55c6bc..30da3ef3aeb86ce8d236d7001be32f92d573f443 100644 (file)
--- a/test/image_content_fade_test.cc
+++ b/test/image_content_fade_test.cc
@@ -34,11 +34,11 @@ BOOST_AUTO_TEST_CASE (image_content_fade_test)
        shared_ptr<Film> film = new_test_film2 ("image_content_fade_test");
        shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
        film->examine_and_add_content (content);
        shared_ptr<Film> film = new_test_film2 ("image_content_fade_test");
        shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->video->set_fade_in (1);
        film->make_dcp ();
 
        content->video->set_fade_in (1);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_dcp ("test/data/image_content_fade_test", film->dir(film->dcp_name()));
 }
 
        check_dcp ("test/data/image_content_fade_test", film->dir(film->dcp_name()));
 }

diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index 20a4424282f6d5891f7c53bcb501c4aec28d97b0..c6145d861908fcb60c63a9e4930e8a011b00f998 100644 (file)
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent(private_data / "prophet_long_clip.mkv"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent(private_data / "prophet_long_clip.mkv"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->make_dcp ();
 
 
        film->make_dcp ();
 

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index a33a6a460d12a558b0f6d99a40e72bc525d95d88..c65340e1c3e8c7339dc369f694318621983f13d5 100644 (file)
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 
        shared_ptr<ImageContent> content (new ImageContent ("test/data/simple_testcard_640x480.png"));
        film->examine_and_add_content (content);
 
        shared_ptr<ImageContent> content (new ImageContent ("test/data/simple_testcard_640x480.png"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
        film->set_container (Ratio::from_id ("185"));
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
        content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
        film->set_container (Ratio::from_id ("185"));
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");


@@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->set_audio_channels (6);
        shared_ptr<FFmpegContent> sound (new FFmpegContent("test/data/sine_440.wav"));
        film->examine_and_add_content (sound);
        film->set_audio_channels (6);
        shared_ptr<FFmpegContent> sound (new FFmpegContent("test/data/sine_440.wav"));
        film->examine_and_add_content (sound);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PP_SMPTE_OV");
 
        AudioMapping mapping = sound->audio->mapping ();
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PP_SMPTE_OV");
 
        AudioMapping mapping = sound->audio->mapping ();

diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc
index 92f6f90d821e1413256f68f50a457f61fb47a37e..40309df87b5aa6709c374ddf4a4d1c542973a847 100644 (file)
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -47,10 +47,10 @@ check (int target_bits_per_second)
        film->set_j2k_bandwidth (target_bits_per_second);
        shared_ptr<ImageContent> content (new ImageContent(private_data / "prophet_frame.tiff"));
        film->examine_and_add_content (content);
        film->set_j2k_bandwidth (target_bits_per_second);
        shared_ptr<ImageContent> content (new ImageContent(private_data / "prophet_frame.tiff"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        content->video->set_length (24 * duration);
        film->make_dcp ();
        content->video->set_length (24 * duration);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::directory_iterator i (boost::filesystem::path ("build") / "test" / name / "video");
        boost::filesystem::path test = *i++;
 
        boost::filesystem::directory_iterator i (boost::filesystem::path ("build") / "test" / name / "video");
        boost::filesystem::path test = *i++;

diff --git a/test/player_test.cc b/test/player_test.cc
index 9d6641cb26ea5dfb04b0ff724164f178c2f2e359..15bdb617fbb99c26f6da3495d183cf1564230965 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
        film->set_audio_channels (6);
 
        film->examine_and_add_content (c);
        film->set_audio_channels (6);
 
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        accumulated.reset (new AudioBuffers (film->audio_channels(), 0));
 
 
        accumulated.reset (new AudioBuffers (film->audio_channels(), 0));
 


@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test)
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->video->set_length (3);
 
        contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->video->set_length (3);


@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test)
 
        film->make_dcp ();
 
 
        film->make_dcp ();
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path ref;
        ref = "test";
 
        boost::filesystem::path ref;
        ref = "test";

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 017c019274af0b69254cd65331b1b6667118609c..0a73b0c23270cf2281ec4cfb928ca613edbd47bf 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -57,10 +57,10 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->make_dcp ();
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (
 
        boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (


@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
        shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
        shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));


@@ -92,10 +92,10 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        shared_ptr<ImageContent> content (new ImageContent("test/data/3d_test"));
        content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        film->examine_and_add_content (content);
        shared_ptr<ImageContent> content (new ImageContent("test/data/3d_test"));
        content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->make_dcp ();
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
 
 
        boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
 


@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
        shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
 
        shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
        shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));


@@ -128,10 +128,10 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->make_dcp ();
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path const video =
                "build/test/recover_test_2d_encrypted/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_E_S_0_1200000.mxf";
 
        boost::filesystem::path const video =
                "build/test/recover_test_2d_encrypted/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_E_S_0_1200000.mxf";


@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
        A->set_key (film->key ());
 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
        A->set_key (film->key ());

diff --git a/test/reels_test.cc b/test/reels_test.cc
index c27762fdb3fe4d3c661e51e1fcf3dae5295e6501..eea9ebfbe309c84ca36cdb73f04b37a00d1c0f38 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (reels_test1)
        film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (B);
        film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (B);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000);
 
        film->set_reel_type (REELTYPE_SINGLE);
        BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000);
 
        film->set_reel_type (REELTYPE_SINGLE);


@@ -97,29 +97,29 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png"));
                film->examine_and_add_content (c);
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png"));
                film->examine_and_add_content (c);

-               wait_for_jobs ();
+               BOOST_REQUIRE (!wait_for_jobs());

                c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png"));
                film->examine_and_add_content (c);
                c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png"));
                film->examine_and_add_content (c);

-               wait_for_jobs ();
+               BOOST_REQUIRE (!wait_for_jobs());

                c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png"));
                film->examine_and_add_content (c);
                c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png"));
                film->examine_and_add_content (c);

-               wait_for_jobs ();
+               BOOST_REQUIRE (!wait_for_jobs());

                c->video->set_length (24);
        }
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
                c->video->set_length (24);
        }
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->make_dcp ();
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_dcp ("test/data/reels_test2", film->dir (film->dcp_name()));
 
 
        check_dcp ("test/data/reels_test2", film->dir (film->dcp_name()));
 


@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        c->set_reference_audio (true);
 
        film2->make_dcp ();
        c->set_reference_audio (true);
 
        film2->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 }
 
 /** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end
 }
 
 /** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end


@@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
        film->examine_and_add_content (dcp);
        shared_ptr<Content> sub (new StringTextFileContent("test/data/subrip.srt"));
        film->examine_and_add_content (sub);
        film->examine_and_add_content (dcp);
        shared_ptr<Content> sub (new StringTextFileContent("test/data/subrip.srt"));
        film->examine_and_add_content (sub);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        list<DCPTimePeriod> reels = film->reels();
        BOOST_REQUIRE_EQUAL (reels.size(), 4);
 
        list<DCPTimePeriod> reels = film->reels();
        BOOST_REQUIRE_EQUAL (reels.size(), 4);


@@ -202,13 +202,13 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        for (int i = 0; i < 4; ++i) {
                content[i].reset (new ImageContent("test/data/flat_green.png"));
                film->examine_and_add_content (content[i]);
        for (int i = 0; i < 4; ++i) {
                content[i].reset (new ImageContent("test/data/flat_green.png"));
                film->examine_and_add_content (content[i]);

-               wait_for_jobs ();
+               BOOST_REQUIRE (!wait_for_jobs());

                content[i]->video->set_length (24);
        }
 
        shared_ptr<StringTextFileContent> subs (new StringTextFileContent("test/data/subrip3.srt"));
        film->examine_and_add_content (subs);
                content[i]->video->set_length (24);
        }
 
        shared_ptr<StringTextFileContent> subs (new StringTextFileContent("test/data/subrip3.srt"));
        film->examine_and_add_content (subs);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        list<DCPTimePeriod> reels = film->reels();
        BOOST_REQUIRE_EQUAL (reels.size(), 4);
 
        list<DCPTimePeriod> reels = film->reels();
        BOOST_REQUIRE_EQUAL (reels.size(), 4);


@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4);
 
        film->make_dcp ();
        BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
 }
 
        check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
 }

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index badf5d9ff20eef1638ecfeb76fa895cd7cafeda3..d5ee0c023cb534f51e5c23d82cca1fa21cffd65a 100644 (file)
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -46,13 +46,13 @@ BOOST_AUTO_TEST_CASE (repeat_frame_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
        film->examine_and_add_content (c);
 
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
        film->examine_and_add_content (c);
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_video_frame_rate (48);
        film->make_dcp ();
 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_video_frame_rate (48);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be 32 frames of red */
        check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
 
        /* Should be 32 frames of red */
        check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index 812b35ff8ec96568626d446c8928bd17fd8b7fb2..a66b6645e26f4373e9d1a758e4b4ab5be804aa0c 100644 (file)
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
        film->examine_and_add_content (content_a);
        shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
        film->examine_and_add_content (content_b);
        film->examine_and_add_content (content_a);
        shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
        film->examine_and_add_content (content_b);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->write_metadata ();
 
        check_within_n (
        film->write_metadata ();
 
        check_within_n (

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index d2f886736625237c88d1507f6dfe29ac4b3274cc..93c994741f50e4926993ed8e4b2c7fe84396ea35 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -41,7 +41,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content
        film->set_interop (false);
        film->make_dcp ();
 
        film->set_interop (false);
        film->make_dcp ();
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path ref;
        ref = "test";
 
        boost::filesystem::path ref;
        ref = "test";


@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (scaling_test)
 
        film->examine_and_add_content (imc);
 
 
        film->examine_and_add_content (imc);
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        imc->video->set_length (1);
 
 
        imc->video->set_length (1);
 

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 2bc0c3bb66c3bfacad9471342deaa5423cf2431b..b5725bb443fa2d228c4e8550e10b83474bdc9961 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -52,11 +52,11 @@ test_silence_padding (int channels)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        film->set_audio_channels (channels);
        film->make_dcp ();
 
        film->set_audio_channels (channels);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        boost::filesystem::path path = "build/test";
        path /= film_name;
 
        boost::filesystem::path path = "build/test";
        path /= film_name;

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 6c08291e117e81df02825b2022d49250f130a683..e30143b1819d18aa2c96c673855b812a8eedeaaa 100644 (file)
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -46,14 +46,14 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/count300bd48.m2ts"));
        film->examine_and_add_content (c);
 
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/count300bd48.m2ts"));
        film->examine_and_add_content (c);
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->write_metadata ();
 
        film->set_video_frame_rate (24);
        film->make_dcp ();
 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->write_metadata ();
 
        film->set_video_frame_rate (24);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be white numbers on a black background counting up from 2 in steps of 2
           up to 300.
 
        /* Should be white numbers on a black background counting up from 2 in steps of 2
           up to 300.

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 31a082015e0d9f4de66d78034cebd81d9fcbda1e..3064abcc6e5cffd474200d7d27eb24f58130fee8 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -49,12 +49,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
        film->examine_and_add_content (content);
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->make_dcp ();
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));
 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));


@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent ("test/data/subrip2.srt"));
        film->examine_and_add_content (content);
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent ("test/data/subrip2.srt"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);


@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
        content->only_text()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
        film->make_dcp ();
        content->only_text()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));


@@ -106,13 +106,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
        film->set_audio_channels (6);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
        film->examine_and_add_content (content);
        film->set_audio_channels (6);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        film->make_dcp ();
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
 }
 
        check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
 }


@@ -129,9 +129,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->make_dcp ();
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be blank video with MXF subtitles */
        check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
 
        /* Should be blank video with MXF subtitles */
        check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));


@@ -151,10 +151,10 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);
        film->examine_and_add_content (content);
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        content->set_position (film, DCPTime());
        film->make_dcp ();
        content->set_position (film, DCPTime());
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->write_metadata ();
 
        check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));
        film->write_metadata ();
 
        check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));

diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index c1524bc2916046322b8c15ca17ceb6fafa9c7f47..c61d34b7149f2c7cbd44054fd87b62752ed1345c 100644 (file)
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -49,13 +49,13 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
        film->set_interop (true);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "DKH_UT_EN20160601def.ssa"));
        film->examine_and_add_content (content);
        film->set_interop (true);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "DKH_UT_EN20160601def.ssa"));
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        film->make_dcp ();
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Find the subtitle file and check it */
        list<string> ignore;
 
        /* Find the subtitle file and check it */
        list<string> ignore;

diff --git a/test/threed_test.cc b/test/threed_test.cc
index a8d3f8a00f737d03fcecb941fc531b65ee41e462..f8a4e85a81126b98ed5835b8a3fbcd9f839c06a7 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
        film->set_name ("test_film1");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);
        film->set_name ("test_film1");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));


@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
        film->set_name ("test_film2");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);
        film->set_name ("test_film2");
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));


@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (threed_test3)
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (R);
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (R);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);


@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (threed_test4)
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);


@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (threed_test5)
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);
        film->examine_and_add_content (L);
        shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
 
        L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
        R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);

diff --git a/test/torture_test.cc b/test/torture_test.cc
index b6079096da6ca3494fe7d0b4136cad43a17094cc..5525eb081cf2106bf0762f1099c327e7c2bef782 100644 (file)
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        /* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of 6dB */
        shared_ptr<Content> staircase = content_factory("test/data/staircase.wav").front ();
        film->examine_and_add_content (staircase);
        /* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of 6dB */
        shared_ptr<Content> staircase = content_factory("test/data/staircase.wav").front ();
        film->examine_and_add_content (staircase);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        staircase->set_position (film, DCPTime::from_frames (2000, film->audio_frame_rate()));
        staircase->set_trim_start (ContentTime::from_frames (12, 48000));
        staircase->set_trim_end (ContentTime::from_frames (35, 48000));
        staircase->set_position (film, DCPTime::from_frames (2000, film->audio_frame_rate()));
        staircase->set_trim_start (ContentTime::from_frames (12, 48000));
        staircase->set_trim_end (ContentTime::from_frames (35, 48000));


@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        /* And again at an offset of 50000 samples, trimmed both start and end, with a gain of 6dB */
        staircase = content_factory("test/data/staircase.wav").front ();
        film->examine_and_add_content (staircase);
        /* And again at an offset of 50000 samples, trimmed both start and end, with a gain of 6dB */
        staircase = content_factory("test/data/staircase.wav").front ();
        film->examine_and_add_content (staircase);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
        staircase->set_trim_start (ContentTime::from_frames (12, 48000));
        staircase->set_trim_end (ContentTime::from_frames (35, 48000));
        staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
        staircase->set_trim_start (ContentTime::from_frames (12, 48000));
        staircase->set_trim_end (ContentTime::from_frames (35, 48000));


@@ -76,14 +76,14 @@ BOOST_AUTO_TEST_CASE (torture_test1)
        /* 1s of red at 5s in */
        shared_ptr<Content> red = content_factory("test/data/flat_red.png").front ();
        film->examine_and_add_content (red);
        /* 1s of red at 5s in */
        shared_ptr<Content> red = content_factory("test/data/flat_red.png").front ();
        film->examine_and_add_content (red);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        red->set_position (film, DCPTime::from_seconds(5));
        red->video->set_length (24);
 
        film->set_video_frame_rate (24);
        film->write_metadata ();
        film->make_dcp ();
        red->set_position (film, DCPTime::from_seconds(5));
        red->video->set_length (24);
 
        film->set_video_frame_rate (24);
        film->write_metadata ();
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        dcp::DCP dcp ("build/test/torture_test1/" + film->dcp_name(false));
        dcp.read ();
 
        dcp::DCP dcp ("build/test/torture_test1/" + film->dcp_name(false));
        dcp.read ();

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index c89d3f29a90c56c6744e0cf4bb59dc0f95e3ada0..5643310c61efa974743e88e5f96abdc151c59488 100644 (file)
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/white.wav"));
        film->examine_and_add_content (content);
 
        shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/white.wav"));
        film->examine_and_add_content (content);
 

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        SF_INFO info;
        info.samplerate = 48000;
 
        SF_INFO info;
        info.samplerate = 48000;

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 9b48f9b28633a6876b5f32e213047956868d9136..a28ea5b7e29a6e311b60cec8c9622465616a940d 100644 (file)
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -53,9 +53,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        A->examine_and_add_content (c);
        A->set_encrypted (true);
        shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        A->examine_and_add_content (c);
        A->set_encrypted (true);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        A->make_dcp ();
        A->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        A_dcp.read ();
 
        dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        A_dcp.read ();


@@ -85,9 +85,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        d->set_reference_video (true);
        B->examine_and_add_content (d);
        B->set_encrypted (true);
        d->set_reference_video (true);
        B->examine_and_add_content (d);
        B->set_encrypted (true);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        B->make_dcp ();
        B->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name());
        B_dcp.read ();
 
        dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name());
        B_dcp.read ();


@@ -116,9 +116,9 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        e->add_kdm (B_kdm);
        e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        C->examine_and_add_content (e);
        e->add_kdm (B_kdm);
        e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        C->examine_and_add_content (e);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        C->make_dcp ();
        C->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Should be 1s red, 1s green, 1s blue */
        check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());
 
        /* Should be 1s red, 1s green, 1s blue */
        check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 285139f7e4a8f03632158d9caebb83e70a3c59b3..392b0498a9d982b3308dcd84e9b5295a77a56305 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        film->set_interop (false);
        shared_ptr<DCPContent> dcp (new DCPContent ("test/data/reels_test2"));
        film->examine_and_add_content (dcp);
        film->set_interop (false);
        shared_ptr<DCPContent> dcp (new DCPContent ("test/data/reels_test2"));
        film->examine_and_add_content (dcp);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Multi-reel DCP can't be referenced if we are using a single reel for the project */
        film->set_reel_type (REELTYPE_SINGLE);
 
        /* Multi-reel DCP can't be referenced if we are using a single reel for the project */
        film->set_reel_type (REELTYPE_SINGLE);


@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (vf_test1)
 
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);
 
        shared_ptr<FFmpegContent> other (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (other);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Not possible if there is overlap */
        other->set_position (film, DCPTime());
 
        /* Not possible if there is overlap */
        other->set_position (film, DCPTime());


@@ -97,13 +97,13 @@ BOOST_AUTO_TEST_CASE (vf_test2)
        ov->set_name ("vf_test2_ov");
        shared_ptr<Content> video = content_factory ("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        ov->set_name ("vf_test2_ov");
        shared_ptr<Content> video = content_factory ("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory ("test/data/white.wav").front();
        ov->examine_and_add_content (audio);
        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory ("test/data/white.wav").front();
        ov->examine_and_add_content (audio);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        ov->make_dcp ();
        ov->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test2_vf");
 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test2_vf");


@@ -113,14 +113,14 @@ BOOST_AUTO_TEST_CASE (vf_test2)
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir (ov->dcp_name ())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir (ov->dcp_name ())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        shared_ptr<Content> sub = content_factory("test/data/subrip4.srt").front();
        vf->examine_and_add_content (sub);
        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        shared_ptr<Content> sub = content_factory("test/data/subrip4.srt").front();
        vf->examine_and_add_content (sub);

-       DCPOMATIC_ASSERT (!wait_for_jobs ());
+       BOOST_REQUIRE (!wait_for_jobs());

        vf->make_dcp ();
        vf->make_dcp ();

-       DCPOMATIC_ASSERT (!wait_for_jobs ());
+       BOOST_REQUIRE (!wait_for_jobs());

        vf->write_metadata ();
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        vf->write_metadata ();
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));


@@ -155,13 +155,13 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        ov->set_name ("vf_test3_ov");
        shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        ov->set_name ("vf_test3_ov");
        shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory("test/data/white.wav").front();
        ov->examine_and_add_content (audio);
        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory("test/data/white.wav").front();
        ov->examine_and_add_content (audio);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        ov->make_dcp ();
        ov->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test3_vf");
 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test3_vf");


@@ -173,11 +173,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        dcp->set_trim_start (ContentTime::from_seconds (1));
        dcp->set_trim_end (ContentTime::from_seconds (1));
        vf->examine_and_add_content (dcp);
        dcp->set_trim_start (ContentTime::from_seconds (1));
        dcp->set_trim_end (ContentTime::from_seconds (1));
        vf->examine_and_add_content (dcp);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        vf->make_dcp ();
        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        vf->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        vf->write_metadata ();
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
        vf->write_metadata ();
 
        dcp::DCP vf_c (vf->dir (vf->dcp_name ()));


@@ -201,13 +201,13 @@ BOOST_AUTO_TEST_CASE (vf_test4)
        ov->set_name ("vf_test4_ov");
        shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        ov->set_name ("vf_test4_ov");
        shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
        ov->examine_and_add_content (video);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory("test/data/white.wav").front();
        ov->examine_and_add_content (audio);
        video->video->set_length (24 * 5);
        shared_ptr<Content> audio = content_factory("test/data/white.wav").front();
        ov->examine_and_add_content (audio);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        ov->make_dcp ();
        ov->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test4_vf");
 
        /* Make the VF */
        shared_ptr<Film> vf = new_test_film ("vf_test4_vf");


@@ -218,17 +218,17 @@ BOOST_AUTO_TEST_CASE (vf_test4)
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);
        shared_ptr<DCPContent> dcp (new DCPContent(ov->dir(ov->dcp_name())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        dcp->set_position(vf, DCPTime::from_seconds(10));
        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        shared_ptr<Content> more_video = content_factory("test/data/flat_red.png").front();
        vf->examine_and_add_content (more_video);
        dcp->set_position(vf, DCPTime::from_seconds(10));
        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
        shared_ptr<Content> more_video = content_factory("test/data/flat_red.png").front();
        vf->examine_and_add_content (more_video);

-       DCPOMATIC_ASSERT (!wait_for_jobs ());
+       BOOST_REQUIRE (!wait_for_jobs());

        more_video->set_position (vf, DCPTime());
        vf->write_metadata ();
        vf->make_dcp ();
        more_video->set_position (vf, DCPTime());
        vf->write_metadata ();
        vf->make_dcp ();

-       DCPOMATIC_ASSERT (!wait_for_jobs ());
+       BOOST_REQUIRE (!wait_for_jobs());

 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
        ov_c.read ();

diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index 5da7ad6418d91df2731d51911ff6493858db809f..d2cb4cea25e28b4b2fac03f4afea1b91fbc413e9 100644 (file)
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -54,9 +54,9 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
        shared_ptr<VideoMXFContent> check = dynamic_pointer_cast<VideoMXFContent> (content);
        BOOST_REQUIRE (check);
        film->examine_and_add_content (content);
        shared_ptr<VideoMXFContent> check = dynamic_pointer_cast<VideoMXFContent> (content);
        BOOST_REQUIRE (check);
        film->examine_and_add_content (content);

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

        film->make_dcp ();
        film->make_dcp ();

-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());

 
        shared_ptr<dcp::MonoPictureAsset> ref (new dcp::MonoPictureAsset (ref_mxf));
        boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
 
        shared_ptr<dcp::MonoPictureAsset> ref (new dcp::MonoPictureAsset (ref_mxf));
        boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");