ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: inkscape: Skip failing tests on i686-linux.

Browse source 
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]: Add
‘fix-32bit-size_t-format’ phase on i686.  In ‘check’ phase, list
additional failing tests on i686.
(inkscape)[arguments]: Do not restore ‘check’ phase on i686.

Change-Id: Id4b11ac7aa725a8a55d04bca221319201e488940
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Kaelyn Takata 2024-08-05 17:43:10 +00:00 committed by Ludovic Courtès
parent 25f4fd8542
commit a4319550a0
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/inkscape.scm
View file

@ -204,6 +204,13 @@ (define-public inkscape/stable
(("add_pdfinput_test\\(font-(spacing|style) 1 draw-all" all)
(string-append "#" all))))))
'())
#$@(if (target-x86-32?)
'((add-after 'unpack 'fix-32bit-size_t-format
(lambda _
;; Fix an error due to format type mismatch with 32-bit size_t.
(substitute* "testfiles/src/visual-bounds-test.cpp"
(("%lu") "%u")))))
'())
(add-after 'unpack 'set-home
;; Mute Inkscape warnings during tests.
(lambda _
@ -239,7 +246,15 @@ (define-public inkscape/stable
"cli_export-ps-level_3_check_output"
"cli_export-ps-level_3_content_check_output"
"cli_export-ps-level_2_content_check_output"
"cli_export-ps-level_2_check_output")))
"cli_export-ps-level_2_check_output"
;; These fail on i686 but not x86-64
#$@(if (target-x86-32?)
'("cli_pdfinput-font-spacing_check_output"
"cli_pdfinput-font-style_check_output"
"cli_pdfinput-latex_check_output"
"cli_pdfinput-multi-page-sample_check_output"
"test_lpe")
'()))))
(invoke "make" "-j" job-count "tests")
(invoke "ctest" "-j" job-count
"--output-on-error"
@ -340,10 +355,13 @@ (define-public inkscape
#~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags))
((#:phases phases)
#~(modify-phases #$phases
(replace 'check
;; Re-instate the tests disabled in inskcape/stable, now that
#$@(if (target-x86-32?)
#~() ;XXX: there are remaining failures on i686
#~((replace 'check
;; Re-instate the tests disabled in inkscape/stable, now that
;; their ImageMagick requirement is satisfied.
(assoc-ref %standard-phases 'check))
(assoc-ref %standard-phases 'check))))
(replace 'wrap-program
;; Ensure Python is available at runtime.
(lambda _