| Message ID | 62ce9b1e2e95d3b480e9d09cb85fe8823b54bf09.1694955548.git.vivien@planete-kraus.eu |
|---|---|
| State | New |
| Headers | show |
| Series | Update tracker, and ignore i686 missing tests | expand |
Am Sonntag, dem 17.09.2023 um 13:29 +0200 schrieb Vivien Kraus: > * gnu/packages/gnome.scm (tracker): Update to 3.6.0. > [#:phases]: On 32-bit systems, disable 2 failing tests. Should be [#:phases]: Add ‘the-added-phase’ otherwise the ChangeLog LGTM. > --- > gnu/packages/gnome.scm | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 2077478ff2..29aa57133d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -9387,7 +9387,7 @@ (define-public gnome-autoar > (define-public tracker > (package > (name "tracker") > - (version "3.5.3") > + (version "3.6.0") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/tracker/" > @@ -9395,7 +9395,7 @@ (define-public tracker > "tracker-" version ".tar.xz")) > (sha256 > (base32 > - > "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl")))) > + > "1whdqidxmagsc35pmz9kcc5vs3bmvbkmnis7prnx3zxs37z2qnaj")))) > (build-system meson-build-system) > (arguments > (list > @@ -9417,6 +9417,22 @@ (define-public tracker > (substitute* "utils/trackertestutils/__main__.py" > (("/bin/bash") > (search-input-file inputs "bin/bash"))))) > + #$@(if (target-x86-32?) > + ;; On 32-bit systems, the far away dates are > incorrect, and > + ;; the floats are not parsed exactly. > + (list > + #~(add-after 'unpack 'relax-float-equality-tests > + (lambda _ > + (substitute* "tests/libtracker- > sparql/tracker-statement-test.c" > + (("g_assert_cmpfloat *\\((.*), ==, ([0- > 9.e-]+)\\);" total actual expected) > + (string-append > "g_assert_cmpfloat_with_epsilon (" > + actual ", " expected ", > 1e-12);"))))) > + #~(add-after 'unpack 'disable-datetime-test > + (lambda _ > + (substitute* "tests/core/tracker-sparql- > test.c" > + (("\\{ \"datetime/direct-1\", .* \\},") > + "/* datetime test disabled */"))))) > + '()) You can (and probably should) make this into a ‘disable-failing-tests’ or inline it into an existing one. Otherwise LGTM but waiting for CI to test. Cheers
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2077478ff2..29aa57133d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9387,7 +9387,7 @@ (define-public gnome-autoar (define-public tracker (package (name "tracker") - (version "3.5.3") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -9395,7 +9395,7 @@ (define-public tracker "tracker-" version ".tar.xz")) (sha256 (base32 - "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl")))) + "1whdqidxmagsc35pmz9kcc5vs3bmvbkmnis7prnx3zxs37z2qnaj")))) (build-system meson-build-system) (arguments (list @@ -9417,6 +9417,22 @@ (define-public tracker (substitute* "utils/trackertestutils/__main__.py" (("/bin/bash") (search-input-file inputs "bin/bash"))))) + #$@(if (target-x86-32?) + ;; On 32-bit systems, the far away dates are incorrect, and + ;; the floats are not parsed exactly. + (list + #~(add-after 'unpack 'relax-float-equality-tests + (lambda _ + (substitute* "tests/libtracker-sparql/tracker-statement-test.c" + (("g_assert_cmpfloat *\\((.*), ==, ([0-9.e-]+)\\);" total actual expected) + (string-append "g_assert_cmpfloat_with_epsilon (" + actual ", " expected ", 1e-12);"))))) + #~(add-after 'unpack 'disable-datetime-test + (lambda _ + (substitute* "tests/core/tracker-sparql-test.c" + (("\\{ \"datetime/direct-1\", .* \\},") + "/* datetime test disabled */"))))) + '()) (add-before 'configure 'set-shell (lambda _ (setenv "SHELL" (which "bash"))))