[SCM] libopenshot/master: New patch to fix failing tests on some non-x86 architectures.
toddy at users.alioth.debian.org
toddy at users.alioth.debian.org
Sat Nov 18 13:11:12 UTC 2017
The following commit has been merged in the master branch:
commit 2dce1839a7787db213e8c1b3e2abb55706bb1d66
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date: Sat Nov 18 13:57:40 2017 +0100
New patch to fix failing tests on some non-x86 architectures.
Closes: #879074, #879075
diff --git a/debian/patches/0003-Fix-failing-tests-by-using-a-fault-tolerance.patch b/debian/patches/0003-Fix-failing-tests-by-using-a-fault-tolerance.patch
new file mode 100644
index 0000000..f951df6
--- /dev/null
+++ b/debian/patches/0003-Fix-failing-tests-by-using-a-fault-tolerance.patch
@@ -0,0 +1,126 @@
+From: "Dr. Tobias Quathamer" <toddy at debian.org>
+Date: Sat, 18 Nov 2017 13:54:22 +0100
+Subject: Fix failing tests by using a fault tolerance
+
+---
+ tests/FFmpegReader_Tests.cpp | 5 ++---
+ tests/ImageWriter_Tests.cpp | 8 ++++----
+ tests/Timeline_Tests.cpp | 20 ++++++++++----------
+ 3 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp
+index 54017e8..b6bce05 100644
+--- a/tests/FFmpegReader_Tests.cpp
++++ b/tests/FFmpegReader_Tests.cpp
+@@ -95,8 +95,8 @@ TEST(FFmpegReader_Check_Video_File)
+ int pixel_index = 112 * 4; // pixel 112 (4 bytes per pixel)
+
+ // Check image properties on scanline 10, pixel 112
+- CHECK_EQUAL(21, (int)pixels[pixel_index]);
+- CHECK_EQUAL(191, (int)pixels[pixel_index + 1]);
++ CHECK_CLOSE(21, (int)pixels[pixel_index], 1);
++ CHECK_CLOSE(191, (int)pixels[pixel_index + 1], 2);
+ CHECK_EQUAL(0, (int)pixels[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)pixels[pixel_index + 3]);
+
+@@ -209,4 +209,3 @@ TEST(FFmpegReader_Multiple_Open_and_Close)
+ // Close reader
+ r.Close();
+ }
+-
+diff --git a/tests/ImageWriter_Tests.cpp b/tests/ImageWriter_Tests.cpp
+index 107ee39..d10c8bd 100644
+--- a/tests/ImageWriter_Tests.cpp
++++ b/tests/ImageWriter_Tests.cpp
+@@ -73,9 +73,9 @@ TEST(ImageWriter_Test_Gif)
+ int pixel_index = 230 * 4; // pixel 230 (4 bytes per pixel)
+
+ // Check image properties
+- CHECK_EQUAL(20, (int)pixels[pixel_index]);
+- CHECK_EQUAL(18, (int)pixels[pixel_index + 1]);
+- CHECK_EQUAL(11, (int)pixels[pixel_index + 2]);
++ CHECK_CLOSE(20, (int)pixels[pixel_index], 5);
++ CHECK_CLOSE(18, (int)pixels[pixel_index + 1], 2);
++ CHECK_CLOSE(11, (int)pixels[pixel_index + 2], 2);
+ CHECK_EQUAL(255, (int)pixels[pixel_index + 3]);
+ }
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/tests/Timeline_Tests.cpp b/tests/Timeline_Tests.cpp
+index 70acd17..76195e8 100644
+--- a/tests/Timeline_Tests.cpp
++++ b/tests/Timeline_Tests.cpp
+@@ -119,8 +119,8 @@ TEST(Timeline_Check_Two_Track_Video)
+ int pixel_index = 230 * 4; // pixel 230 (4 bytes per pixel)
+
+ // Check image properties
+- CHECK_EQUAL(21, f->GetPixels(pixel_row)[pixel_index]);
+- CHECK_EQUAL(191, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
++ CHECK_CLOSE(21, (int)f->GetPixels(pixel_row)[pixel_index], 2);
++ CHECK_CLOSE(191, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+
+@@ -128,7 +128,7 @@ TEST(Timeline_Check_Two_Track_Video)
+ f = t.GetFrame(2);
+
+ // Check image properties
+- CHECK_EQUAL(176, (int)f->GetPixels(pixel_row)[pixel_index]);
++ CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
+ CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+@@ -138,7 +138,7 @@ TEST(Timeline_Check_Two_Track_Video)
+
+ // Check image properties
+ CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]);
+- CHECK_EQUAL(190, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
++ CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+
+@@ -147,7 +147,7 @@ TEST(Timeline_Check_Two_Track_Video)
+
+ // Check image properties
+ CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index]);
+- CHECK_EQUAL(106, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
++ CHECK_CLOSE(106, (int)f->GetPixels(pixel_row)[pixel_index + 1], 1);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+
+@@ -156,7 +156,7 @@ TEST(Timeline_Check_Two_Track_Video)
+
+ // Check image properties
+ CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]);
+- CHECK_EQUAL(190, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
++ CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+
+@@ -165,15 +165,15 @@ TEST(Timeline_Check_Two_Track_Video)
+
+ // Check image properties
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index]);
+- CHECK_EQUAL(94, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
+- CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
++ CHECK_CLOSE(94, (int)f->GetPixels(pixel_row)[pixel_index + 1], 1);
++ CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+
+ // Get frame
+ f = t.GetFrame(4);
+
+ // Check image properties
+- CHECK_EQUAL(176, (int)f->GetPixels(pixel_row)[pixel_index]);
++ CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1);
+ CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]);
+ CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]);
+@@ -439,4 +439,4 @@ TEST(Timeline_Effect_Blur)
+
+ // Close reader
+ t.Close();
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 6fab4cf..397eea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Use-system-libjsoncpp.patch
Disable-failing-tests.patch
+0003-Fix-failing-tests-by-using-a-fault-tolerance.patch
--
libopenshot packaging
More information about the pkg-multimedia-commits
mailing list