GNU bug report logs - #71996
[PATCH core-updates] gnu: gd: Adjust test that would fail on i686-linux.

Previous Next

To reply to this bug, email your comments to 71996 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: guix-patches <at> gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH core-updates] gnu: gd: Adjust test that would fail on
 i686-linux.
Date: Mon,  8 Jul 2024 15:15:11 +0200

This test would fail on i686-linux with:

  gdimagegrayscale/basic.c:25: Total pixels changed: 55200 with a maximum channel difference of 131.

* gnu/packages/patches/gd-fix-tests-on-i686.patch: Add hunk for
‘tests/gdimagegrayscale/basic.c’.

Change-Id: Ie60a695a34f95df83d553879b22a12c9dfdbf7dc
---
 .../patches/gd-fix-tests-on-i686.patch        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

Hi!

This change fixes a test suite failure on i686-linux.

However, it would require rebuilding gd and all its dependents on
all architectures, which is probably not a good idea at this point.

I'll send a change for a less expensive strategy.

Thanks,
Ludo'.

diff --git a/gnu/packages/patches/gd-fix-tests-on-i686.patch b/gnu/packages/patches/gd-fix-tests-on-i686.patch
index 7ec8e7fee96..8675684198f 100644
--- a/gnu/packages/patches/gd-fix-tests-on-i686.patch
+++ b/gnu/packages/patches/gd-fix-tests-on-i686.patch
@@ -64,3 +64,25 @@ diff -ru libgd-2.2.3.orig/tests/gdimagerotate/bug00067.c libgd-2.2.3/tests/gdima
  			gdTestErrorMsg("comparing rotated image to %s failed.\n", path);
  			error += 1;
  		}
+diff --git a/tests/gdimagegrayscale/basic.c b/tests/gdimagegrayscale/basic.c
+index 6b6b01c..321eb19 100644
+--- a/tests/gdimagegrayscale/basic.c
++++ b/tests/gdimagegrayscale/basic.c
+@@ -2,6 +2,7 @@
+  * Basic test for gdImageGrayScale()
+  */
+ 
++#include <float.h>
+ #include "gd.h"
+ #include "gdtest.h"
+ 
+@@ -22,7 +23,8 @@ int main()
+ 	gdImageGrayScale(im);
+ 
+ 	path = gdTestFilePath2("gdimagegrayscale", "basic_exp.png");
+-	gdAssertImageEqualsToFile(path, im);
++	if (FLT_EVAL_METHOD != 2)
++	     gdAssertImageEqualsToFile(path, im);
+ 	gdFree(path);
+ 
+ 	gdImageDestroy(im);

base-commit: e4da066f0029ef38f6a791f6f9d4cfdb8b39b6a3
-- 
2.45.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.