diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
| commit | 2da4caba7871455c097c0ed940dd6f2332dbda5d (patch) | |
| tree | f87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /test | |
| parent | 94aadbd62c259a73d7511522dd167d519c68c5f9 (diff) | |
| parent | 5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff) | |
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways,
and use #pragma rather than -Wno to only disable warnings where
necessary.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 3 | ||||
| -rw-r--r-- | test/stream_test.cc | 11 | ||||
| -rw-r--r-- | test/test.h | 3 |
3 files changed, 13 insertions, 4 deletions
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); 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; 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> |