Fix use of DCPOMATIC_TEST_PRIVATE variable to specify where

[dcpomatic.git] / test / j2k_bandwidth_test.cc

diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc
index ed8f5d9c8d523e18464b7d0522503fdc52234feb..832f48c3f8cd6ac28a21068edc650d651a9db228 100644 (file)
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/bandwidth_test.cc
+ *  @brief Test whether we output whatever J2K bandwidth is requested.
+ *  @ingroup specific
+ */
+
 #include "test.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
@@ -35,17 +40,17 @@ check (int target_bits_per_second)
 {
        int const duration = 10;
 
-       string const name = "j2k_bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
+       string const name = "bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
        shared_ptr<Film> film = new_test_film (name);
        film->set_name (name);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_j2k_bandwidth (target_bits_per_second);
-       shared_ptr<ImageContent> content (new ImageContent (film, private_data / "prophet_frame.tiff"));
+       shared_ptr<ImageContent> content (new ImageContent(TestPaths::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 ();
-       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++;
@@ -58,7 +63,7 @@ check (int target_bits_per_second)
        BOOST_CHECK ((actual_bits_per_second / target_bits_per_second) < 1.15);
 }
 
-BOOST_AUTO_TEST_CASE (j2k_bandwidth_test)
+BOOST_AUTO_TEST_CASE (bandwidth_test)
 {
        check (50000000);
        check (100000000);