aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2018-02-15 20:54:28 -0500
committerDavid Thompson <dthompson2@worcester.edu>2018-02-21 22:16:38 -0500
commit267379f852f9d6d00c76120963711d54357ba53d (patch)
treed50040e19049c99d9d0c799183384cb3ec4abc3a /tests
parentea6b1baec7515ec941f35c186ab314ec1c844250 (diff)
downloadguix-267379f852f9d6d00c76120963711d54357ba53d.tar
guix-267379f852f9d6d00c76120963711d54357ba53d.tar.gz
environment: Add --manifest option.
* guix/scripts/environment.scm (show-help, %options): Add -m/--manifest. (options/resolve-packages): Handle manifests. * tests/guix-envronment.sh: Add a test. * doc/guix.texi (Invoking guix environment): Document it.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-environment.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index bf5ca17fa5..b44aca099d 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -62,6 +62,15 @@ fi
guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"'
+# Make sure 'GUIX_ENVIRONMENT' points to the profile when building from a
+# manifest.
+echo "(use-modules (guix profiles) (gnu packages bootstrap))
+
+(packages->manifest (list %bootstrap-guile))
+" > $tmpdir/manifest.scm
+guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \
+ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"'
+
# Make sure '-r' works as expected.
rm -f "$gcroot"
expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \