Remove swaroop variant.

4 files changed, 12 insertions, 177 deletions

diff --git a/test/ecinema_kdm_test.cc b/test/ecinema_kdm_test.cc
deleted file mode 100644
index e44a626ba..000000000
--- a/test/ecinema_kdm_test.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    DCP-o-matic is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "lib/decrypted_ecinema_kdm.h"
-#include "lib/encrypted_ecinema_kdm.h"
-#include "lib/config.h"
-#include <boost/test/unit_test.hpp>
-extern "C" {
-#include <libavutil/aes_ctr.h>
-}
-#include <fstream>
-
-using std::string;
-using boost::optional;
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-
-BOOST_AUTO_TEST_CASE (ecinema_kdm_roundtrip_test1)
-{
-	dcp::Key key (AES_CTR_KEY_SIZE);
-	DecryptedECinemaKDM dec ("123-456-789-0", "Hello world", key, optional<dcp::LocalTime>(), optional<dcp::LocalTime>());
-	EncryptedECinemaKDM enc = dec.encrypt (Config::instance()->decryption_chain()->leaf());
-	DecryptedECinemaKDM dec2 (enc, *Config::instance()->decryption_chain()->key());
-	BOOST_CHECK_EQUAL (dec2.id(), "123-456-789-0");
-	BOOST_CHECK_EQUAL (dec2.name(), "Hello world");
-	BOOST_CHECK (dec2.key() == key);
-	BOOST_CHECK (!static_cast<bool>(dec2.not_valid_before()));
-	BOOST_CHECK (!static_cast<bool>(dec2.not_valid_after()));
-}
-
-BOOST_AUTO_TEST_CASE (ecinema_kdm_roundtrip_test2)
-{
-	dcp::Key key (AES_CTR_KEY_SIZE);
-	DecryptedECinemaKDM dec ("123-456-789-0", "Hello world", key, dcp::LocalTime("2019-06-01T15:05:23+01:00"), dcp::LocalTime("2019-07-02T19:10:12+02:00"));
-	EncryptedECinemaKDM enc = dec.encrypt (Config::instance()->decryption_chain()->leaf());
-	DecryptedECinemaKDM dec2 (enc, *Config::instance()->decryption_chain()->key());
-	BOOST_CHECK_EQUAL (dec2.id(), "123-456-789-0");
-	BOOST_CHECK_EQUAL (dec2.name(), "Hello world");
-	BOOST_CHECK (dec2.key() == key);
-	BOOST_REQUIRE (static_cast<bool>(dec2.not_valid_before()));
-	BOOST_CHECK_EQUAL (dec2.not_valid_before()->as_string(), "2019-06-01T15:05:23+01:00");
-	BOOST_REQUIRE (static_cast<bool>(dec2.not_valid_after()));
-	BOOST_CHECK_EQUAL (dec2.not_valid_after()->as_string(), "2019-07-02T19:10:12+02:00");
-}
-
-BOOST_AUTO_TEST_CASE (ecinema_kdm_roundtrip_test3)
-{
-	dcp::Key key (AES_CTR_KEY_SIZE);
-	DecryptedECinemaKDM dec ("123-456-789-0", "Hello world", key, optional<dcp::LocalTime>(), optional<dcp::LocalTime>());
-	EncryptedECinemaKDM enc = dec.encrypt (Config::instance()->decryption_chain()->leaf());
-	string const enc_xml = enc.as_xml ();
-	EncryptedECinemaKDM enc2 (enc_xml);
-	DecryptedECinemaKDM dec2 (enc2, *Config::instance()->decryption_chain()->key());
-	BOOST_CHECK_EQUAL (dec2.id(), "123-456-789-0");
-	BOOST_CHECK_EQUAL (dec2.name(), "Hello world");
-	BOOST_CHECK (dec2.key() == key);
-	BOOST_CHECK (!static_cast<bool>(dec2.not_valid_before()));
-	BOOST_CHECK (!static_cast<bool>(dec2.not_valid_after()));
-}
-
-BOOST_AUTO_TEST_CASE (ecinema_kdm_roundtrip_test4)
-{
-	dcp::Key key (AES_CTR_KEY_SIZE);
-	DecryptedECinemaKDM dec ("123-456-789-0", "Hello world", key, dcp::LocalTime("2019-06-01T15:05:23+01:00"), dcp::LocalTime("2019-07-02T19:10:12+02:00"));
-	EncryptedECinemaKDM enc = dec.encrypt (Config::instance()->decryption_chain()->leaf());
-	string const enc_xml = enc.as_xml();
-	EncryptedECinemaKDM enc2 (dcp::file_to_string("build/test/shit_the_bed.xml"));
-	DecryptedECinemaKDM dec2 (enc2, *Config::instance()->decryption_chain()->key());
-	BOOST_CHECK_EQUAL (dec2.id(), "123-456-789-0");
-	BOOST_CHECK_EQUAL (dec2.name(), "Hello world");
-	BOOST_CHECK (dec2.key() == key);
-	BOOST_REQUIRE (static_cast<bool>(dec2.not_valid_before()));
-	BOOST_CHECK_EQUAL (dec2.not_valid_before()->as_string(), "2019-06-01T15:05:23+01:00");
-	BOOST_REQUIRE (static_cast<bool>(dec2.not_valid_after()));
-	BOOST_CHECK_EQUAL (dec2.not_valid_after()->as_string(), "2019-07-02T19:10:12+02:00");
-}
-
-#endif
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 1b030ce80..505bca766 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -71,11 +71,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 
 	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -119,11 +115,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 
 	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -144,11 +136,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-					 );
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -172,11 +160,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -203,11 +187,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -232,11 +212,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -250,11 +226,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
 	film->set_container(Ratio::from_id("185"));
 
 	shared_ptr<Job> job(new TranscodeJob(film));
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go();
 }
 
@@ -308,11 +280,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 	Rs->audio->set_mapping (map);
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 
 	check_ffmpeg ("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", 1);
@@ -340,11 +308,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 	}
 
 	shared_ptr<Job> job (new TranscodeJob (film2));
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -371,11 +335,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	shared_ptr<Job> job (new TranscodeJob (film2));
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -389,11 +349,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 	film->set_audio_channels (2);
 
 	shared_ptr<Job> job(new TranscodeJob(film));
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go();
 }
 
@@ -414,10 +370,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 
 	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", EXPORT_FORMAT_H264_AAC, false, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
diff --git a/test/util_test.cc b/test/util_test.cc
index c1d11b761..df494b0f4 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -106,27 +106,6 @@ BOOST_AUTO_TEST_CASE (utf8_strlen_test)
 	BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11U);
 }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-BOOST_AUTO_TEST_CASE (swaroop_chain_test)
-{
-	shared_ptr<dcp::CertificateChain> cc (
-		new dcp::CertificateChain (
-			openssl_path(),
-			"dcpomatic.com",
-			"dcpomatic.com",
-			".dcpomatic.smpte-430-2.ROOT",
-			".dcpomatic.smpte-430-2.INTERMEDIATE",
-			"CS.dcpomatic.smpte-430-2.LEAF"
-			)
-		);
-
-	write_swaroop_chain (cc, "build/test/swaroop_chain");
-	shared_ptr<dcp::CertificateChain> back = read_swaroop_chain ("build/test/swaroop_chain");
-
-	BOOST_CHECK (cc->root_to_leaf() == back->root_to_leaf());
-}
-#endif
-
 BOOST_AUTO_TEST_CASE (careful_string_filter_test)
 {
 	BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("hello_world"));
diff --git a/test/wscript b/test/wscript
index c9e9f2188..39b96e39d 100644
--- a/test/wscript
+++ b/test/wscript
@@ -67,7 +67,6 @@ def build(bld):
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc
                  digest_test.cc
-                 ecinema_kdm_test.cc
                  empty_test.cc
                  ffmpeg_audio_only_test.cc
                  ffmpeg_audio_test.cc