From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0D7tEjnqi2bQJgAAqHPOHw:P1 (envelope-from ) for ; Mon, 08 Jul 2024 13:31:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 0D7tEjnqi2bQJgAAqHPOHw (envelope-from ) for ; Mon, 08 Jul 2024 15:31:37 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JxIF0hRs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720445497; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=y99ggmxX2vdSSAY9NtjRymwyIPBK/doFsPh4+OuMZUQ=; b=nA5pP8SylYYfLrRA4/8bMafte3WPucb/662t/jetQ2vX8noadx/28+MfCjDs0NV/PyiQgE RBQEtCWa/VCjM2Y5NfcJTcNzgUocxSkS5kBGJW/dwHRedPFMKmAEfLg11hgKjr1TX6Km+l lWftQlcpWWPGnfnOBW8LDUiOAm6ieHm1K0bDYPCLhe9N4kFeCwUk3FlgkmTy17MNvFQwGG sGaE6uZ6For2i8/fvsppSgKClOLY6+zVQOBhkWkj9EcYFNLoBTWnY68esdfNMl/BRL+35Q V/9vqJx572/F2I42NK2OusY5Rg8Yi29tu6mrpswiRGIAaVN/uGJdk4UFHft5kQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720445497; a=rsa-sha256; cv=none; b=NY3Q+0JHEQKXH1yL4s9pZ9UGZ/iGWAIHsD+I1OElpEduANgww1zZG3eiEvK/SRIo5keGVV yjn+m3vNGzOji8dO/2W311i9WhXBzAO1YDC+9ho6/UnUAAgtp8pkusmbYVuxstFNJsijDv Q3YGekvCT0RscwyLB1aRq8qq3Tnhr92P4CNQevehq+3yxhPL6+PY9WRkMVjzAwFgP3bgLr h3/JkLlUJKqrUu1YUKBebenmq0ak6mGXkp6lZUsfqAWlcGK3LWamRRtiezBHe9bygAQBrD TI6wRe9fYIlbb/EC32td1sP1exl9THlyvLpj8iQtrjgJapMeAQEBixQVUdnomA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JxIF0hRs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EC30614BC9 for ; Mon, 8 Jul 2024 15:31:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQoDp-0003aL-W5; Mon, 08 Jul 2024 09:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQoDn-0003aC-1H for guix-patches@gnu.org; Mon, 08 Jul 2024 09:15:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQoDm-00038N-OU for guix-patches@gnu.org; Mon, 08 Jul 2024 09:15:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQoDq-0003cg-LC for guix-patches@gnu.org; Mon, 08 Jul 2024 09:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71996] [PATCH core-updates] gnu: gd: Adjust test that would fail on i686-linux. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2024 13:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71996 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71996@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172044454313894 (code B ref -1); Mon, 08 Jul 2024 13:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jul 2024 13:15:43 +0000 Received: from localhost ([127.0.0.1]:49897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQoDX-0003c1-DO for submit@debbugs.gnu.org; Mon, 08 Jul 2024 09:15:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:37632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQoDV-0003bt-Bh for submit@debbugs.gnu.org; Mon, 08 Jul 2024 09:15:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQoDP-0003TX-Va for guix-patches@gnu.org; Mon, 08 Jul 2024 09:15:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQoDO-00031b-Qc; Mon, 08 Jul 2024 09:15:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=y99ggmxX2vdSSAY9NtjRymwyIPBK/doFsPh4+OuMZUQ=; b=JxIF0hRsNY8cOF TQviLSAEvsev0w0QchO7ir3VFxb7QWlF2KzMrLdim7q2bEhvigl2PDmTNbU27I1RHxdWxE/VXzOhe nuixClygu+JVhP7xNWZPaJ4kpry/Qj10Qw0CF11oJAb9kwxywVtmBpNO6JZKR/LyI2DZrT6KKOrEW LdoQUfAPw17/hDMWTIbGwC5HuyEx9tuEbLUJ3SQ3M7XoQ71W80DBOM219jSGe3qWnR+jnF6Frfh3G 3IdqhclIsQBgIJaYRBGUgIuKWhOkX0BvF9gR9ry4XT9sKjM4tGthEC+6liwN7mU/pnrri1GVhEU4Q EztpRzdXcVyVlK5cpHQw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 8 Jul 2024 15:15:11 +0200 Message-ID: <1b02ee414266de5cca5bfbf5896231e8827a0794.1720444433.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: EC30614BC9 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.79 X-Spam-Score: -4.79 X-TUID: XOeXX9LWnJ+S 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 + #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