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

tests: Adjust to cope with glibc graft.

Browse source 
This is a followup to 1328c4cca5, which
led to failures for tests that were not prepared to cope with that.

* tests/guix-environment-container.sh (hello_drv_nested): Pass “-E
GUIX_BUILD_OPTIONS” so ‘--no-grafts’ is passed.
* tests/guix-pack.sh (GUIX_BUILD_OPTIONS): Add ‘--no-grafts’.
* tests/transformations.scm ("options->transformation, with-graft"):
Skip when ‘glibc-final’ has a replacement.

Change-Id: Ia65c9aeb06f524252815b8290a5ca7bf97ee8136
This commit is contained in:
Ludovic Courtès 2023-10-28 01:30:37 +02:00
parent 6eb147dc31
commit ff1146fb4f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/guix-environment-container.sh
View file

@ -270,5 +270,5 @@ guix build hello -d
env="$(type -P pre-inst-env)" env="$(type -P pre-inst-env)"
guix shell -C -D guix -- "$env" guix build hello -d && false # cannot work guix shell -C -D guix -- "$env" guix build hello -d && false # cannot work
hello_drv="$(guix build hello -d)" hello_drv="$(guix build hello -d)"
hello_drv_nested="$(cd "$(dirname env)" && guix shell --bootstrap -CW -D guix -- "$env" guix build hello -d)" hello_drv_nested="$(cd "$(dirname env)" && guix shell --bootstrap -E GUIX_BUILD_OPTIONS -CW -D guix -- "$env" guix build hello -d)"
test "$hello_drv" = "$hello_drv_nested" test "$hello_drv" = "$hello_drv_nested"

4
tests/guix-pack.sh
View file

@ -30,7 +30,9 @@ fi
guix pack --version guix pack --version
# Use --no-substitutes because we need to verify we can do this ourselves. # Use --no-substitutes because we need to verify we can do this ourselves.
GUIX_BUILD_OPTIONS="--no-substitutes" # Use --no-grafts to avoid interference--e.g., --dry-run passing even when
# given an unsupported package.
GUIX_BUILD_OPTIONS="--no-substitutes --no-grafts"
export GUIX_BUILD_OPTIONS export GUIX_BUILD_OPTIONS
test_directory="`mktemp -d`" test_directory="`mktemp -d`"

5
tests/transformations.scm
View file

@ -187,6 +187,11 @@ (define-module (test-transformations)
(string=? (package-full-name dep) (string=? (package-full-name dep)
(package-full-name findutils))))))))))) (package-full-name findutils)))))))))))
;; The following test requires grafting enabled, but it becomes extremely
;; expensive if there's a graft on glibc or other package deep in the graph.
(when (package-replacement (@ (gnu packages commencement) glibc-final))
(test-skip 1))
(test-assert "options->transformation, with-graft" (test-assert "options->transformation, with-graft"
(let* ((p (dummy-package "guix.scm" (let* ((p (dummy-package "guix.scm"
(inputs `(("foo" ,grep) (inputs `(("foo" ,grep)