Fix parameters when running tests with valgrind.

[libdcp.git] / test / dcp_test.cc

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index b6e14d2529cfc0d3e688180be25d303a74ad1490..54ecab00cf616e48d8244a9b506c6b8ad3435a10 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "dcp.h"
@@ -43,8 +57,6 @@ using boost::shared_ptr;
 static shared_ptr<dcp::DCP>
 make_simple (boost::filesystem::path path)
 {
-       Kumu::cth_test = true;
-
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "A Test DCP";
@@ -61,8 +73,8 @@ make_simple (boost::filesystem::path path)
        boost::filesystem::create_directories (path);
        shared_ptr<dcp::DCP> d (new dcp::DCP (path));
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
-       cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
-       cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
+       cpl->set_content_version_id ("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11");
+       cpl->set_content_version_label_text ("content-version-label-text");
        cpl->set_metadata (xml_meta);
 
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
@@ -109,6 +121,8 @@ make_simple (boost::filesystem::path path)
 /** Test creation of a 2D SMPTE DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test1)
 {
+       RNGFixer fixer;
+
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "Created by libdcp";
        xml_meta.issuer = "OpenDCP 0.0.25";
@@ -121,7 +135,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 /** Test creation of a 3D DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test2)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
@@ -222,7 +236,7 @@ BOOST_AUTO_TEST_CASE (dcp_test4)
 /** Test creation of a 2D DCP with an Atmos track */
 BOOST_AUTO_TEST_CASE (dcp_test5)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
@@ -311,6 +325,8 @@ BOOST_AUTO_TEST_CASE (dcp_test6)
 /** Test creation of a 2D Interop DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test7)
 {
+       RNGFixer fix;
+
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "Created by libdcp";
        xml_meta.issuer = "OpenDCP 0.0.25";