From 1250034d5aff14fe236aad9900233a2b6f8563bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 31 Jul 2016 18:51:38 +0200 Subject: [PATCH] tests: 'guix-environment-container.sh' works when run from a tmpfs. Fixes . Reported by Ting-Wei Lan . * 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. --- tests/guix-environment-container.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 5ea6c49263..12da950eba 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -65,10 +65,15 @@ mount_test_code=" (match (string-split line #\space) ;; Empty line. ((\"\") #f) - ;; Ignore these types of file systems. - ((_ _ (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\" - \"devpts\" \"cgroup\" \"mqueue\") _ _ _) + ;; Ignore the root file system. + ((_ \"/\" _ _ _ _) #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))) (string-split (call-with-input-file \"/proc/mounts\" read-string)