From 72ab7172b8de822215cea644b148df5eacb8aa0a Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Thu, 29 Mar 2018 04:32:59 +0900 Subject: Fix build error on DragonFlyBSD (sync with other *BSD) (#240) DragonFlyBSD has no "bsd" in uname, so add 'dragonfly' to conditionals. -- e.g. uname(1) in DragonFlyBSD [root@ ~]# uname DragonFly [root@ ~]# python -c "import sys; print(sys.platform)" dragonfly5 --- test/util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/util.py b/test/util.py index c15476b..b9c1b0c 100644 --- a/test/util.py +++ b/test/util.py @@ -46,7 +46,7 @@ def wait_for_mount(mount_process, mnt_dir, def cleanup(mnt_dir): # Don't bother trying Valgrind if things already went wrong - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: cmd = [ 'umount', '-f', mnt_dir ] else: cmd = [pjoin(basename, 'util', 'fusermount3'), @@ -56,7 +56,7 @@ def cleanup(mnt_dir): def umount(mount_process, mnt_dir): - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: cmdline = [ 'umount', mnt_dir ] else: # fusermount3 will be setuid root, so we can only trace it with @@ -109,7 +109,7 @@ def fuse_test_marker(): skip = lambda x: pytest.mark.skip(reason=x) - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: return pytest.mark.uses_fuse() with subprocess.Popen(['which', 'fusermount3'], stdout=subprocess.PIPE, -- cgit v1.2.3