Skip to content

Commit 21b55a0

Browse files
committed
example/ioctl: build on FreeBSD, but add protocol check instead.
1 parent f666736 commit 21b55a0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

example/meson.build

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
examples = [ 'passthrough', 'passthrough_fh',
22
'hello', 'hello_ll', 'printcap',
3-
'ioctl_client', 'poll_client',
3+
'ioctl_client', 'poll_client', 'ioctl',
44
'cuse', 'cuse_client' ]
55

66
if not platform.endswith('bsd')
77
examples += 'passthrough_ll'
88

9-
# Is this really not supported? We should check with
10-
# the FreeBSD guys, maybe we're just doing something
11-
# wrong.
12-
examples += [ 'null', 'ioctl' ]
9+
# According to Conrad Meyer <[email protected]>, FreeBSD doesn't
10+
# support mounting files, This is enforced in vfs_domount_first()
11+
# with the v_type != VDIR check.
12+
examples += [ 'null' ]
1313
endif
1414

1515
threaded_examples = [ 'notify_inval_inode',

test/test_examples.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ def test_passthrough(tmpdir, name, debug, capfd):
166166
else:
167167
umount(mount_process, mnt_dir)
168168

169+
@pytest.mark.skipif(fuse_proto < (7,11),
170+
reason='not supported by running kernel')
169171
def test_ioctl(tmpdir):
170172
progname = pjoin(basename, 'example', 'ioctl')
171173
if not os.path.exists(progname):

0 commit comments

Comments
 (0)