diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-03-17 11:53:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-03-18 23:30:48 +0100 |
| commit | cf4e4272f72346c39964b128f78b2297f04dba55 (patch) | |
| tree | 380d760483d5bf2cec0e33db42e82207b387ecb4 /test | |
| parent | b0b3c6f0cdc034ef515f72d72fd72fbb71d1ca63 (diff) | |
Tidy how we're finding the tags and xsd directories.
Diffstat (limited to 'test')
| -rw-r--r-- | test/encryption_test.cc | 12 | ||||
| -rw-r--r-- | test/recovery_test.cc | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index becd1df7..a4246294 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -153,10 +153,10 @@ BOOST_AUTO_TEST_CASE (encryption_test) "> build/test/xmllint.log 2>&1 < /dev/null" ); -#ifdef LIBDCP_POSIX - BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); -#else +#ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); +#else + BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); #endif r = system ("xmlsec1 verify " @@ -167,9 +167,9 @@ BOOST_AUTO_TEST_CASE (encryption_test) "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate " "build/test/encryption_test.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null"); -#ifdef LIBDCP_POSIX - BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); -#else +#ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); +#else + BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); #endif } diff --git a/test/recovery_test.cc b/test/recovery_test.cc index 59e477a3..1f76b964 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -52,12 +52,12 @@ BOOST_AUTO_TEST_CASE (recovery) boost::filesystem::remove_all ("build/test/baz"); boost::filesystem::create_directories ("build/test/baz"); - shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE)); - shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", false); + auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE); + auto writer = mp->start_write ("build/test/baz/video1.mxf", false); int written_size = 0; for (int i = 0; i < 24; ++i) { - dcp::FrameInfo info = writer->write (data.data(), data.size()); + auto info = writer->write (data.data(), data.size()); BOOST_CHECK_EQUAL (info.hash, "c3c9a3adec09baf2b0bcb65806fbeac8"); written_size = info.size; } @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (recovery) boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + data.size() * 11); { - FILE* f = fopen ("build/test/baz/video2.mxf", "rb+"); + auto f = fopen ("build/test/baz/video2.mxf", "rb+"); rewind (f); char zeros[256]; memset (zeros, 0, 256); @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE (recovery) fclose (f); } -#ifdef LIBDCP_POSIX +#ifndef LIBDCP_WINDOWS Kumu::ResetTestRNG (); #endif |