From 2bec3708fc744c18128c5bdb4c2a332f5c8eb283 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Jul 2020 02:26:17 +0200
Subject: Ignore libxml++ warnings in a nicer way.

---
 test/stream_test.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 1e1462464..b4b7c260b 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -22,12 +22,15 @@
  *  @brief Some simple tests of FFmpegAudioStream.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
+#include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
-#include "lib/film.h"
+#include "lib/warnings.h"
+#include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
 
 using std::pair;
 using std::list;
-- 
cgit v1.2.3


From 89504842f5aff01ac8a8e46ec48eea0a14235739 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Jul 2020 02:28:59 +0200
Subject: Fix test warning

---
 test/ffmpeg_encoder_test.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test')

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index d824ede30..d80bfb2e0 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -53,6 +53,9 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 		name += "prores";
 		extension = "mov";
 		break;
+	case EXPORT_FORMAT_H264_PCM:
+	case EXPORT_FORMAT_SUBTITLES_DCP:
+		BOOST_REQUIRE (false);
 	}
 
 	name = String::compose("%1_test%2", name, number);
-- 
cgit v1.2.3


From 0d711edad0694ee5f5c735b221d52387499e2d36 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Jul 2020 19:54:34 +0200
Subject: Disable warnings from magick.

---
 src/lib/warnings.h | 3 ++-
 test/test.h        | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index e225c0339..bfb666e1b 100644
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -20,7 +20,8 @@
 
 #define DCPOMATIC_DISABLE_WARNINGS \
   _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+  _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
+  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
 
 #define DCPOMATIC_ENABLE_WARNINGS \
   _Pragma("GCC diagnostic pop")
diff --git a/test/test.h b/test/test.h
index 77108af46..b620a68a0 100644
--- a/test/test.h
+++ b/test/test.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <Magick++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>
 
-- 
cgit v1.2.3