diff options
| author | Noé Lopez <noelopez@free.fr> | 2025-11-18 17:46:38 +0900 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2026-04-10 18:24:56 -0700 |
| commit | 1078e42a60655a1512e41f01d0b1d75df70bf9df (patch) | |
| tree | 6e928ad045fe22cd592e3111a4c16af51bcb5a6c /tests | |
| parent | 3cbd6bd79c8d26079be5b39583e3d7c10567acb2 (diff) | |
tests: Fix non-deterministic AppImage tests.
The tested AppImages were not actually relocatable and would rely on items
being available on the environment’s store (apart from glibc).
* guix/scripts/pack.scm (wrapped-manifest): New function.
(guix-pack): Extract relocatable manifest to wrapped-manifest.
* tests/pack.scm: Use relocatable profiles in AppImage tests.
Fixes: <https://issues.guix.gnu.org/76850>
Change-Id: Ib3123054913fce903d215dc0629d806e9fceebc7
Reported-by: Reepca Russelstein <reepca@russelstein.xyz>
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pack.scm | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/tests/pack.scm b/tests/pack.scm index d0a1b72eb9..5422e156b9 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com> -;;; Copyright © 2024 Noé Lopez <noelopez@free.fr> +;;; Copyright © 2024-2025 Noé Lopez <noelopez@free.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -337,11 +337,13 @@ (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile - ;; When using '--appimage-extract-and-run', the dynamic - ;; linker is necessary, hence glibc below. - (content (packages->manifest (list hello glibc))) - (hooks '()) - (locales? #f))) + ;; When using '--appimage-extract-and-run', the dynamic + ;; linker is necessary, hence glibc below. + (content (wrapped-manifest + (packages->manifest (list hello glibc)))) + (relative-symlinks? #t) + (hooks '()) + (locales? #f))) (image (self-contained-appimage "hello-appimage" profile #:entry-point "bin/hello" #:extra-options @@ -369,11 +371,13 @@ (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile - ;; When using '--appimage-extract-and-run', the dynamic - ;; linker is necessary, hence glibc below. - (content (packages->manifest (list guile-3.0 glibc))) - (hooks '()) - (locales? #f))) + ;; When using '--appimage-extract-and-run', the dynamic + ;; linker is necessary, hence glibc below. + (content (wrapped-manifest + (packages->manifest (list guile-3.0 glibc)))) + (relative-symlinks? #t) + (hooks '()) + (locales? #f))) (image (self-contained-appimage "guile-appimage" profile #:entry-point "bin/guile" #:localstatedir? #t |