me
/
guix
Archived
1
0
Fork 0
Code

tests: 'guix-environment-container.sh' works when run from a tmpfs. 

Fixes <http://bugs.gnu.org/22004>.
Reported by Ting-Wei Lan <lantw44@gmail.com>.

* tests/guix-environment-container.sh (mount_test_code): Add 'match'
clause to ignore "/"; augment clause that ignores specific file system
types such that it does not ignore parent mount points.
master
Ludovic Courtès 2016-07-31 18:51:38 +02:00
parent 40f788b9f6
commit 1250034d5a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/guix-environment-container.sh
View File

@ -65,10 +65,15 @@ mount_test_code="
(match (string-split line #\space) (match (string-split line #\space)
;; Empty line. ;; Empty line.
((\"\") #f) ((\"\") #f)
;; Ignore these types of file systems. ;; Ignore the root file system.
((_ _ (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\" ((_ \"/\" _ _ _ _)
\"devpts\" \"cgroup\" \"mqueue\") _ _ _)
#f) #f)
;; Ignore these types of file systems, except if they
;; correspond to a parent file system.
((_ mount (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\"
\"devpts\" \"cgroup\" \"mqueue\") _ _ _)
(and (string-prefix? mount (getcwd))
mount))
((_ mount _ _ _ _) ((_ mount _ _ _ _)
mount))) mount)))
(string-split (call-with-input-file \"/proc/mounts\" read-string) (string-split (call-with-input-file \"/proc/mounts\" read-string)