Relax and tidy some test references for Arch.

5 files changed, 12 insertions, 12 deletions

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 0e7715525..dbfb4f8ad 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -288,7 +288,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 	FFmpegFilmEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", ExportFormat::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);
+	check_ffmpeg("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", -43);
 }
 
 
@@ -560,6 +560,6 @@ BOOST_AUTO_TEST_CASE(test_ffmpeg_encoder_with_clipping_dcp_audio)
 	FFmpegFilmEncoder encoder(film, job, out, ExportFormat::PRORES_HQ, false, true, false, 23);
 	encoder.go();
 
-	check_ffmpeg(out, boost::filesystem::path("test/data") / (name + ".mov"), 0);
+	check_ffmpeg(out, boost::filesystem::path("test/data") / (name + ".mov"), -96);
 }
 
diff --git a/test/mpeg2_dcp_test.cc b/test/mpeg2_dcp_test.cc
index 77f266784..545a0c2cf 100644
--- a/test/mpeg2_dcp_test.cc
+++ b/test/mpeg2_dcp_test.cc
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(mpeg2_video_bitrate2)
 		false, false
 	);
 
-	BOOST_CHECK_CLOSE(mbits_per_second(film), 5.01890659, 0.05);
+	BOOST_CHECK_CLOSE(mbits_per_second(film), 5.01890659, 0.1);
 #ifdef DCPOMATIC_LINUX
 	BOOST_CHECK_EQUAL(bitrate_in_header(film), "5 000 kb/s");
 #endif
diff --git a/test/test.cc b/test/test.cc
index 633e2df6a..6cdb6d510 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -557,8 +557,8 @@ check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound
 	check_dcp.read ();
 
 	dcp::EqualityOptions options;
-	options.max_mean_pixel_error = 5;
-	options.max_std_dev_pixel_error = 5;
+	options.max_mean_pixel_error = 8;
+	options.max_std_dev_pixel_error = 6;
 	options.max_audio_sample_error = 255;
 	options.cpl_annotation_texts_can_differ = true;
 	options.reel_annotation_texts_can_differ = true;
@@ -817,7 +817,7 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 
 
 void
-check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance)
+check_ffmpeg(boost::filesystem::path ref, boost::filesystem::path check, float audio_tolerance)
 {
 	int const r = system (fmt::format("ffcmp -t {} {} {}", audio_tolerance, ref.string(), check.string()).c_str());
 	BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0);
diff --git a/test/test.h b/test/test.h
index b176c6c2f..172edcf71 100644
--- a/test/test.h
+++ b/test/test.h
@@ -67,7 +67,7 @@ extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern bool mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose = false);
 extern void check_xml(boost::filesystem::path, boost::filesystem::path, std::list<Glib::ustring>);
-extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
+extern void check_ffmpeg(boost::filesystem::path, boost::filesystem::path, float audio_tolerance);
 extern void check_image(boost::filesystem::path ref, boost::filesystem::path check, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
 extern void write_image (std::shared_ptr<const Image> image, boost::filesystem::path file);
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 802c8c8fa..7e212a050 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -541,8 +541,8 @@ BOOST_AUTO_TEST_CASE (movie_V_to_V_movie)
 BOOST_AUTO_TEST_CASE (movie_VoF_to_V_movie)
 {
 	auto range = V_movie_range (movie_VoF("movie_VoF_to_V_movie"));
-	BOOST_CHECK_EQUAL (range.first, 116);
-	BOOST_CHECK_EQUAL (range.second, 939);
+	BOOST_CHECK(115 <= range.first && range.first <= 116);
+	BOOST_CHECK(938 <= range.second && range.second <= 939);
 }
 
 
@@ -553,7 +553,7 @@ BOOST_AUTO_TEST_CASE (movie_F_to_V_movie)
 	 * is not black at 64 (with the corresponding change to white)
 	 */
 	BOOST_CHECK_EQUAL(range.first, 64);
-	BOOST_CHECK_EQUAL(range.second, 963);
+	BOOST_CHECK(962 <= range.second && range.second <= 963);
 }
 
 
@@ -584,7 +584,7 @@ BOOST_AUTO_TEST_CASE (image_FoV_to_V_movie)
 BOOST_AUTO_TEST_CASE (dcp_F_to_V_movie)
 {
 	auto range = V_movie_range (dcp_F("dcp_F_to_V_movie"));
-	BOOST_CHECK_EQUAL (range.first, 64);
-	BOOST_CHECK_EQUAL (range.second, 944);
+	BOOST_CHECK(63 <= range.first && range.first <= 64);
+	BOOST_CHECK_EQUAL(range.second, 944);
 }