From 72e586fcae78e467d01e2add09c1db26be6bfa93 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 25 Jun 2024 15:14:16 +0200 Subject: gnu: gtk: Fix build on aarch64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtk)[arguments]<#:test-options>: Rename failing test suite to match upstream change on aarch64-linux. Change-Id: Ibdf03a94e71f72283a093cba6d5a328004defa5c Co-authored-by: Ludovic Courtès --- gnu/packages/gtk.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fb10351849..e5da382a12 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1171,19 +1171,29 @@ application suites.") '("-Dgtk_doc=false") '("-Dgtk_doc=true")) "-Dman-pages=true") - #:test-options '(list "--setup=x11" ;defaults to wayland - ;; Use the same test options as upstream uses for - ;; their CI. - "--suite=gtk" - "--no-suite=failing" - "--no-suite=flaky" - "--no-suite=headless" ; requires mutter… - "--no-suite=gsk-compare-broadway" - ;; These seem to fail on aarch64, and Debian has - ;; also disabled these, see: - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075 - "--no-suite=wayland_failing" - "--no-suite=wayland_gles_failing") + #:test-options #~(list "--setup=x11" ;defaults to wayland + ;; Use the same test options as upstream uses for + ;; their CI. + "--suite=gtk" + "--no-suite=failing" + "--no-suite=flaky" + "--no-suite=headless" ; requires mutter… + "--no-suite=gsk-compare-broadway" + ;; These seem to fail on aarch64, and Debian has + ;; also disabled these, see: + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075 + "--no-suite=wayland_failing" + + ;; The correct name of the test that fails on + ;; AArch64 is 'wayland_gles2_failing': + ;; . + ;; The second arm of the 'if' is kept to avoid a + ;; rebuild on other architectures. TODO: Remove + ;; on the next rebuild cycle. + #$(if (and (not (%current-target-system)) + (string=? (%current-system) "aarch64-linux")) + "--no-suite=wayland_gles2_failing" + "--no-suite=wayland_gles_failing")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file -- cgit v1.2.3 /N files pointing to a pipe....This allows users to write Bash commands like: guix time-machine -C <(echo %default-channels) -- ... or: guix build -m <(echo '(specifications->manifest (list "guile"))') Previously, on GNU/Linux, they would fail with: error: failed to load '/dev/fd/63': No such file or directory * guix/ui.scm (try-canonicalize-path): New procedure. (load*): Use it. * tests/guix-build.sh: Test 'guix build -m' with a /dev/fd/N file. Ludovic Courtès 2023-04-28tests: guix-build.sh: Don't use hidden gcc for transformation tests....* tests/guix-build.sh: Do not try to rewrite gcc, it is hidden and so will not be rewritten, as per eee95b5a879b7096dffd533f24107cf8926b621e. Instead, try to build grep with coreutils rewritten to hello. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Josselin Poiret 2023-04-21tests: Fix checks for expected failures....Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Eric Bavier 2022-02-18guix build: Warn when attempting to build an unsupported package....Fixes <https://issues.guix.gnu.org/51801>. Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>. * guix/scripts/build.scm (options->derivations)[warn-if-unsupported]: New procedure. [compute-derivation]: Use it. * tests/guix-build.sh: Add test. Ludovic Courtès