summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-06 21:05:38 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-06 21:27:16 +0200
commit381ac93b5ed7bd51f8f3ab6a8b0127f8ea6288f8 (patch)
tree64dde1cf5aa98619b6edcb9df87e52ec8592cb48
parentd45d8904b08fc16253ae8167e82ebfb593265ea9 (diff)
downloadpatches-381ac93b5ed7bd51f8f3ab6a8b0127f8ea6288f8.tar
patches-381ac93b5ed7bd51f8f3ab6a8b0127f8ea6288f8.tar.gz
tests: Deal with 'mount-points' not returning "/".
Fixes <http://bugs.gnu.org/20261>. Reported by Mark H Weaver <mhw@netris.org>. * tests/syscalls.scm ("mount-points"): Check for a few other likely mount points in addition to "/".
-rw-r--r--tests/syscalls.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index f26331e164..706f3dff44 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -19,6 +19,7 @@
(define-module (test-syscalls)
#:use-module (guix build syscalls)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26)
#:use-module (srfi srfi-64)
#:use-module (ice-9 match))
@@ -45,7 +46,10 @@
(memv (system-error-errno args) (list EPERM ENOENT)))))
(test-assert "mount-points"
- (member "/" (mount-points)))
+ ;; Reportedly "/" is not always listed as a mount point, so check a few
+ ;; others (see <http://bugs.gnu.org/20261>.)
+ (any (cute member <> (mount-points))
+ '("/" "/proc" "/sys" "/dev")))
(test-assert "swapon, ENOENT/EPERM"
(catch 'system-error