nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Ensure 'unshare' works before relying on it. 

Fixes <https://bugs.gnu.org/35642>.
Reported by Josh Holland <josh@inv.alid.pw>.

* tests/guix-pack-relocatable.sh: Before invoking 'unshare' at the
bottom, add "if unshare -r true" condition.
* tests/guix-pack.sh: Likewise.
This commit is contained in:
Ludovic Courtès 2019-05-09 17:13:00 +02:00
parent 18160c3408
commit 8deb65c378
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/guix-pack-relocatable.sh
View File

@ -65,8 +65,15 @@ export relocatable_option
tarball="`guix pack $relocatable_option -S /Bin=bin sed`" tarball="`guix pack $relocatable_option -S /Bin=bin sed`"
(cd "$test_directory"; tar xvf "$tarball") (cd "$test_directory"; tar xvf "$tarball")
# Run that relocatable 'sed' in a user namespace where we "erase" the store by if unshare -r true # Are user namespaces supported?
# mounting an empty file system on top of it. That way, we exercise the then
# wrapper code that creates the user namespace and bind-mounts the store. # Run that relocatable 'sed' in a user namespace where we "erase" the store by
unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"; echo "$STORE_PARENT"/*; "$test_directory/Bin/sed" --version > "$test_directory/output"' # mounting an empty file system on top of it. That way, we exercise the
# wrapper code that creates the user namespace and bind-mounts the store.
unshare -mrf sh -c 'mount -t tmpfs none "$STORE_PARENT"; echo "$STORE_PARENT"/*; "$test_directory/Bin/sed" --version > "$test_directory/output"'
else
# Run the relocatable 'sed' in the current namespaces. This is a weak
# test because we're going to access store items from the host store.
"$test_directory/Bin/sed" --version > "$test_directory/output"
fi
grep 'GNU sed' "$test_directory/output" grep 'GNU sed' "$test_directory/output"

4
tests/guix-pack.sh
View File

@ -1,6 +1,6 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> # Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2018 Ludovic Courtès <ludo@gnu.org> # Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -59,7 +59,7 @@ is_available () {
type "$1" > /dev/null type "$1" > /dev/null
} }
if is_available chroot && is_available unshare; then if is_available chroot && is_available unshare && unshare -r true; then
# Verify we can use what we built. # Verify we can use what we built.
unshare -r chroot . /opt/gnu/bin/guile --version unshare -r chroot . /opt/gnu/bin/guile --version
cd - cd -