From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB7B31581C1 for ; Mon, 15 Jul 2024 04:35:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40C0C2BC043; Mon, 15 Jul 2024 04:35:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21A592BC043 for ; Mon, 15 Jul 2024 04:35:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16AF933BF08 for ; Mon, 15 Jul 2024 04:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E0571E22 for ; Mon, 15 Jul 2024 04:35:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1721018059.68f0e9969e5761d580346c0788186dcf471e5a0c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cppcheck/cppcheck-2.13.0.ebuild dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch X-VCS-Directories: dev-util/cppcheck/files/ dev-util/cppcheck/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 68f0e9969e5761d580346c0788186dcf471e5a0c X-VCS-Branch: master Date: Mon, 15 Jul 2024 04:35:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0d0006f-3d7f-4824-852f-0600f43f6baf X-Archives-Hash: 67ccb3bc980c4f82dae79e3f0dcfb3f2 commit: 68f0e9969e5761d580346c0788186dcf471e5a0c Author: Sam James gentoo org> AuthorDate: Mon Jul 15 04:34:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 15 04:34:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f0e996 dev-util/cppcheck: backport 32-bit test(-only) fix Bug: https://bugs.gentoo.org/935368 Signed-off-by: Sam James gentoo.org> dev-util/cppcheck/cppcheck-2.13.0.ebuild | 4 ++++ .../files/cppcheck-2.13.0-32-bit-tests.patch | 28 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild index 71c678e92cc5..949840795040 100644 --- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild +++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild @@ -75,6 +75,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.13.0-32-bit-tests.patch +) + src_prepare() { cmake_src_prepare diff --git a/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch b/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch new file mode 100644 index 000000000000..a31a014f5968 --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/935368 +https://github.com/danmar/cppcheck/commit/9118d330d387e73a20e1bc46c65387306afa0895 + +From 9118d330d387e73a20e1bc46c65387306afa0895 Mon Sep 17 00:00:00 2001 +From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> +Date: Sat, 23 Dec 2023 20:59:59 +0100 +Subject: [PATCH] Fix test failure on 32bit platform (#5803) + +--- a/test/testother.cpp ++++ b/test/testother.cpp +@@ -2173,6 +2173,7 @@ class TestOther : public TestFixture { + "}\n"); + ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 't' should be passed by const reference.\n", errout.str()); + ++ Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build(); + check("struct S {\n" // #12138 + " union {\n" + " int a = 0;\n" +@@ -2189,7 +2190,7 @@ class TestOther : public TestFixture { + "};\n" + "void f(S s) {\n" + " if (s.x > s.y) {}\n" +- "}\n"); ++ "}\n", /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0); + ASSERT_EQUALS("", errout.str()); + + check("struct S { std::list l; };\n" // #12147 +