diff options
author | David Thompson <dthompson2@worcester.edu> | 2015-11-03 08:32:53 -0500 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2015-11-03 11:41:04 -0500 |
commit | b7d48312bbfc7bdbb3895eb10edc352eeb555b98 (patch) | |
tree | 90b3b401a88358aee843fb25d7fff293946d2a02 /tests/containers.scm | |
parent | 9ff7827a21c13e67fb72196da10ab1ad30d79ddf (diff) | |
download | guix-b7d48312bbfc7bdbb3895eb10edc352eeb555b98.tar guix-b7d48312bbfc7bdbb3895eb10edc352eeb555b98.tar.gz |
build: container: Add feature test predicates.
* gnu/build/linux-container.scm (user-namespace-supported?,
unprivileged-user-namespace-supported?, setgroups-supported?): New
procedures.
* tests/container.scm: Use predicates.
* tests/syscalls.scm: Likewise.
Diffstat (limited to 'tests/containers.scm')
-rw-r--r-- | tests/containers.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/containers.scm b/tests/containers.scm index 0ba81491ba..12982a64f7 100644 --- a/tests/containers.scm +++ b/tests/containers.scm @@ -28,8 +28,9 @@ ;; Skip these tests unless user namespaces are available and the setgroups ;; file (introduced in Linux 3.19 to address a security issue) exists. -(unless (and (file-exists? "/proc/self/ns/user") - (file-exists? "/proc/self/setgroups")) +(unless (and (user-namespace-supported?) + (unprivileged-user-namespace-supported?) + (setgroups-supported?)) (exit 77)) (test-begin "containers") |