diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
| commit | 0da7c88a1afb221f97e2e96c159b1a984e4e2f71 (patch) | |
| tree | 558590d5ad0a2ced262c2142915b738d898ddbf0 /test | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'test')
| -rw-r--r-- | test/client_server_test.cc | 4 | ||||
| -rw-r--r-- | test/player_test.cc | 2 | ||||
| -rw-r--r-- | test/recover_test.cc | 2 | ||||
| -rw-r--r-- | test/test.cc | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 1816de8e6..51594a47a 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -130,6 +130,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) { delete *i; } + + delete server; } BOOST_AUTO_TEST_CASE (client_server_test_yuv) @@ -209,5 +211,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) { delete *i; } + + delete server; } diff --git a/test/player_test.cc b/test/player_test.cc index 2412fc312..d48060242 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test) film->examine_and_add_content (C); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->full_length(), DCPTime::from_seconds (3)); + BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000)); A->set_position (DCPTime::from_seconds (0)); B->set_position (DCPTime::from_seconds (10)); diff --git a/test/recover_test.cc b/test/recover_test.cc index bf07811dd..c9a593241 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test) film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test/video/185_2K_3651eded785682b85f4baca4b1d3b7a9_24_bicubic_200000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test/video/185_2K_e8efb95857b62aa6ff94e3d669e75776_24_bicubic_100000000_P_S_3D.mxf"; boost::filesystem::copy_file ( video, diff --git a/test/test.cc b/test/test.cc index 1d8041656..32f74a7d2 100644 --- a/test/test.cc +++ b/test/test.cc @@ -143,7 +143,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) static void note (dcp::NoteType t, string n) { - if (t == dcp::ERROR) { + if (t == dcp::DCP_ERROR) { cerr << n << "\n"; } } |