TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
guix/tests
History
John Kehayias 905443abb7
shell: Fix '--emulate-fhs' sometimes not including 'glibc-for-fhs'. 
Fixes <https://issues.guix.gnu.org/58861>.

Previously the order of the options giving to 'guix shell' could mean that the
'glibc-for-fhs' package included with the '--emulate-fhs' option would not
appear in the container.  For example, using the development option with a
package using the 'gnu-build-system', e.g. 'guix shell -CFD hello', would
include the regular 'glibc' package.  The option ordered mattered: 'guix shell
-CD hello -F' would include the expected 'glibc-for-fhs'.  We fix this by
having 'glibc-for-fhs' added to the package list just before calling
'options-with-caching' so the option order given by the user does not matter.

* guix/scripts/shell.scm (%options): Move the '--emulate-fhs' (expression
. ...) component from here...
(parse-args): ... to here.
* tests/guix-environment-container.sh: Add a test to check that
'glibc-for-fhs' is in the container even when 'glibc' is included in the 'guix
shell' package list.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-11-06 12:38:02 +01:00
..
keys tests: Ensure test OpenPGP keys never expire. 2022-05-18 23:20:21 +02:00
services services: Add lightdm-service-type. 2022-08-28 22:28:47 -04:00
accounts.scm
base16.scm
base32.scm
base64.scm
boot-parameters.scm tests: Add test for menu-entry roundtrips as sexps. 2022-08-28 23:37:28 +02:00
bournish.scm
build-emacs-utils.scm tests: build-emacs-utils: Allow test to pass on Emacs 27 too. 2022-07-13 10:49:40 -04:00
build-utils.scm
builders.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
cache.scm cache: Catch invalid 'last-expiry-cleanup'. 2022-06-04 12:04:23 +02:00
challenge.scm
channels.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
combinators.scm
containers.scm
cpan.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
cpio.scm
cran.scm
crate.scm tests: Adjust crate importer test to spdx changes. 2022-05-30 16:34:39 +02:00
cve-sample.json
cve.scm
debug-link.scm
derivations.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
discovery.scm
egg.scm
elm.scm import: Add Elm importer. 2022-05-22 01:07:52 +02:00
elpa.scm
file-systems.scm
gem.scm import: gem: Support importing a specific version of a gem. 2022-09-17 19:09:27 +02:00
gexp.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
git-authenticate.scm
git.scm git: 'update-cached-checkout' returns the commit ID when given a tag. 2022-10-17 09:37:27 +02:00
glob.scm
gnu-maintenance.scm gnu-maintenance: Test latest-html-release. 2022-09-26 23:29:37 +02:00
go.scm
grafts.scm
graph.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
gremlin.scm
guix-archive.sh
guix-authenticate.sh
guix-build-branch.sh tests: 'guix build --with-commit' output no longer refers to the tag ID. 2022-10-22 01:46:54 +02:00
guix-build.sh
guix-daemon.sh Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
guix-describe.sh guix describe: Adjust test to latest changes. 2022-09-04 23:10:10 +02:00
guix-download.sh
guix-environment-container.sh shell: Fix '--emulate-fhs' sometimes not including 'glibc-for-fhs'. 2022-11-06 12:38:02 +01:00
guix-environment.sh
guix-gc.sh
guix-git-authenticate.sh
guix-graph.sh
guix-hash.sh
guix-home.sh tests: Make tests inside container reproducible. 2022-08-05 15:28:03 +02:00
guix-lint.sh
guix-pack-localstatedir.sh
guix-pack-relocatable.sh
guix-pack.sh tests: Fix wrong target triplets. 2022-05-25 09:28:43 +02:00
guix-package-aliases.sh
guix-package-net.sh
guix-package.sh scripts: package: Transform before creating manifest entries. 2022-05-23 16:24:46 +02:00
guix-repl.sh
guix-shell-export-manifest.sh shell: Fix '--export-manifest' for cached profiles and when '-p' is used. 2022-06-16 23:57:40 +02:00
guix-shell.sh store: Open daemon connections with SOCK_CLOEXEC. 2022-09-04 23:10:10 +02:00
guix-style.sh style: Add '--whole-file' option. 2022-08-08 11:53:33 +02:00
guix-system.sh tests: Attempt to build 'desktop.tmpl' on all major architectures. 2022-10-07 16:01:39 +02:00
hackage.scm import: hackage: Filter upper/mixed case dependencies too. 2022-06-06 13:26:51 +02:00
hexpm.scm import: Add hex.pm importer. 2022-06-15 10:18:34 +02:00
home-import.scm home: import: Use (guix read-print) to render the config file. 2022-09-20 19:24:31 +02:00
home-services.scm home: services: Add 'lookup-home-service-types' procedure. 2022-06-04 12:04:24 +02:00
http-client.scm
import-git.scm
import-github.scm
import-utils.scm tests: Add new test cases for beautify-description. 2022-10-05 23:59:48 +02:00
inferior.scm guix: inferior: Fix the behaviour of open-inferior #:error-port. 2022-07-08 13:51:34 +01:00
ipfs.scm
lint.scm gnu: python-setuptools: Move to python-build. 2022-10-27 19:43:06 +02:00
minetest.scm
modules.scm
monads.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
nar.scm
networking.scm
offload.scm
opam.scm
openpgp.scm
pack.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
packages.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
pki.scm
print.scm import: print: Quasiquote properties 2022-09-29 22:59:48 +02:00
processes.scm
profiles.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
publish.scm publish: Send uncached narinfo replies from the main thread. 2022-04-29 18:07:17 +02:00
pypi.scm
read-print.scm read-print: Correctly support multiple same-named newline forms. 2022-09-20 19:24:31 +02:00
records.scm tests: Add sanitizer test. 2022-07-01 12:10:29 +02:00
scripts.scm
search-paths.scm
services.scm services: Make <service-type> 'description' field mandatory. 2022-05-18 22:29:54 +02:00
sets.scm
size.scm
status.scm status: Relay "updating substitutes" messages. 2022-06-26 23:19:14 +02:00
store-database.scm
store-deduplication.scm
store-roots.scm
store.scm
style.scm style: Adjust test to not emit blank lines. 2022-08-08 11:22:32 +02:00
substitute.scm substitute: Retry downloading when a nar is unavailable. 2022-09-28 22:28:27 +02:00
swh.scm
syscalls.scm
system.scm Remove now unnecessary uses of (guix grafts). 2022-10-22 01:46:55 +02:00
test.drv
texlive.scm tests: Adjust texlive importer tests. 2022-07-22 23:03:46 +02:00
transformations.scm transformations: '--with-source' now operates in depth. 2022-09-29 22:59:49 +02:00
ui.scm ui: Improve pager selection logic when less is not installed. 2022-06-16 23:57:41 +02:00
union.scm
upstream.scm
utils.scm
uuid.scm
workers.scm