projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert mac rdisk vs disk stuff as I'm not convinced it makes much difference.
[dcpomatic.git]
/
test
/
interrupt_encoder_test.cc
diff --git
a/test/interrupt_encoder_test.cc
b/test/interrupt_encoder_test.cc
index 8883c2d6f43e97c781d6e388875502bcfa3daf27..ddad2ee77baf3e45d79d7082b37e7dc6f0c38c6f 100644
(file)
--- a/
test/interrupt_encoder_test.cc
+++ b/
test/interrupt_encoder_test.cc
@@
-18,6
+18,11
@@
*/
*/
+/** @file test/interrupt_encoder_test.cc
+ * @brief Test clean shutdown of threads if a DCP encode is interrupted.
+ * @ingroup specific
+ */
+
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
@@
-40,13
+45,13
@@
BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
film->set_container (Ratio::from_id ("185"));
film->set_name ("interrupt_encoder_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("interrupt_encoder_test");
- shared_ptr<FFmpegContent> content (new FFmpegContent
(film, private_data / "prophet
_clip.mkv"));
+ shared_ptr<FFmpegContent> content (new FFmpegContent
(TestPaths::private_data / "prophet_long
_clip.mkv"));
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->make_dcp ();
film->make_dcp ();
- dcpomatic_sleep (10);
+ dcpomatic_sleep
_seconds
(10);
JobManager::drop ();
}
JobManager::drop ();
}