From 3a068fcbb316fa94dc1bf8f514a42f399ab04850 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Dec 2025 19:43:08 +0200 Subject: [PATCH] gnu: cppcheck: Fix tests on non-x86 systems. * gnu/packages/check.scm (cppcheck)[arguments]: Add a phase to adjust the expected output from some tests to match the adjusted upstream output. Change-Id: I4953f79479a2192fa1a428b4e2988729a05be679 --- gnu/packages/check.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d603acc0742..03118e1b722 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -833,7 +833,17 @@ format.") (arguments '(#:parallel-tests? #f #:configure-flags '("-DBUILD_TESTS=ON" - "-DUSE_BUNDLED_TINYXML2=OFF"))) + "-DUSE_BUNDLED_TINYXML2=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-testcondition-test + (lambda _ + (substitute* "test/testcondition.cpp" + (("test.cpp:4\\] -> \\[test.cpp:6") + "test.cpp:4:25] -> [test.cpp:6:18") + (("test.cpp:3\\] -> \\[test.cpp:5(.*false)"_ rest) + (string-append "test.cpp:3:22] -> [test.cpp:5:22" rest + " [knownConditionTrueFalse]")))))))) (inputs (list tinyxml2)) (home-page "https://cppcheck.sourceforge.io")