summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-06 20:30:19 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-06 20:30:19 +0100
commitdcccb2dd1d180b8be67e539395dccbe82b0fb5a8 (patch)
tree53b76a2df1343e5896bc9462ec8661179ede2ee3 /test
parent5f71c3f0a7a041b3621f7325915d1105424f7e53 (diff)
Move some CPL writing from picture/sound assets to the MXF. Pick up key_id from CPL assets and hence provide and test for encrypted() method on DCP.
Diffstat (limited to 'test')
-rw-r--r--test/tests.cc19
1 files changed, 11 insertions, 8 deletions
diff --git a/test/tests.cc b/test/tests.cc
index 1a29857a..4fc81571 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -68,6 +68,9 @@ wav (libdcp::Channel)
return "test/data/1s_24-bit_48k_silence.wav";
}
+static string test_corpus = "../libdcp-test";
+
+#include "decryption_test.cc"
#include "dcp_test.cc"
#include "error_test.cc"
#include "read_dcp_test.cc"
@@ -76,12 +79,12 @@ wav (libdcp::Channel)
#include "color_test.cc"
#include "recovery_test.cc"
-BOOST_AUTO_TEST_CASE (crypt_chain)
-{
- boost::filesystem::remove_all ("build/test/crypt");
- boost::filesystem::create_directory ("build/test/crypt");
- libdcp::make_crypt_chain ("build/test/crypt");
-}
+//BOOST_AUTO_TEST_CASE (crypt_chain)
+//{
+// boost::filesystem::remove_all ("build/test/crypt");
+// boost::filesystem::create_directory ("build/test/crypt");
+// libdcp::make_crypt_chain ("build/test/crypt");
+//}
-#include "encryption_test.cc"
-#include "certificates_test.cc"
+//#include "encryption_test.cc"
+//#include "certificates_test.cc"