diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 15:40:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 16:23:05 +0200 |
| commit | 75a6f66815db811cc41aadbe93033a6efd3ad62f (patch) | |
| tree | 7a4313c883bad3c09e1771a00b419a1c594a47c5 | |
| parent | 37592014e13abead7a691d0dcb5918d1a10f5cd6 (diff) | |
| download | guix-75a6f66815db811cc41aadbe93033a6efd3ad62f.tar.gz guix-75a6f66815db811cc41aadbe93033a6efd3ad62f.zip | |
tests: Move 'guix environment -C --no-cwd' test where it belongs.
This ensures that this test is skipped in contexts where user namespaces
are not supported, instead of failing.
This is a followup to commit b6dc08393e6a8313b88ce422fc3c1e4e9c0efc6f.
* tests/guix-environment.sh: Move '--container --no-cwd' test to...
* tests/guix-environment-container.sh: ... here.
| -rw-r--r-- | tests/guix-environment-container.sh | 7 | ||||
| -rw-r--r-- | tests/guix-environment.sh | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 78507f76c0..32a5ba1f97 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -144,6 +144,13 @@ HOME="$tmpdir" guix environment --bootstrap --container --user=foognu \ --share="$tmpdir/umock" \ -- guile -c "$usertest" +# if not sharing CWD, chdir home +( + cd "$tmpdir" \ + && guix environment --bootstrap --container --no-cwd --user=foo \ + --ad-hoc guile-bootstrap --pure \ + -- /bin/sh -c 'test $(pwd) == "/home/foo" -a ! -d '"$tmpdir" +) # Check the exit code. diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 5a5a69d58c..a670db36be 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -84,14 +84,6 @@ echo "(use-modules (guix profiles) (gnu packages bootstrap)) guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"' -# if not sharing CWD, chdir home -( - cd "$tmpdir" \ - && guix environment --bootstrap --container --no-cwd --user=foo \ - --ad-hoc guile-bootstrap --pure \ - -- /bin/sh -c 'test $(pwd) == "/home/foo" -a ! -d '"$tmpdir" -) - # Make sure '-r' works as expected. rm -f "$gcroot" expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \ |