diff options
author | Nikolaus Rath <Nikolaus@rath.org> | 2017-08-25 10:48:09 +0200 |
---|---|---|
committer | Nikolaus Rath <Nikolaus@rath.org> | 2017-08-25 10:48:09 +0200 |
commit | 21b55a05a158b1c225ba312529bc068cadd5431d (patch) | |
tree | b5203fe6cfd9feb0a14aedfca649b2617058c9bc | |
parent | f66673663a5227a729633a8d50915de9be69990b (diff) |
example/ioctl: build on FreeBSD, but add protocol check instead.
-rw-r--r-- | example/meson.build | 10 | ||||
-rwxr-xr-x | test/test_examples.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/example/meson.build b/example/meson.build index 8440e00..673982c 100644 --- a/example/meson.build +++ b/example/meson.build @@ -1,15 +1,15 @@ examples = [ 'passthrough', 'passthrough_fh', 'hello', 'hello_ll', 'printcap', - 'ioctl_client', 'poll_client', + 'ioctl_client', 'poll_client', 'ioctl', 'cuse', 'cuse_client' ] if not platform.endswith('bsd') examples += 'passthrough_ll' - # Is this really not supported? We should check with - # the FreeBSD guys, maybe we're just doing something - # wrong. - examples += [ 'null', 'ioctl' ] + # According to Conrad Meyer <cem@freebsd.org>, FreeBSD doesn't + # support mounting files, This is enforced in vfs_domount_first() + # with the v_type != VDIR check. + examples += [ 'null' ] endif threaded_examples = [ 'notify_inval_inode', diff --git a/test/test_examples.py b/test/test_examples.py index 609cf24..60b6888 100755 --- a/test/test_examples.py +++ b/test/test_examples.py @@ -166,6 +166,8 @@ def test_passthrough(tmpdir, name, debug, capfd): else: umount(mount_process, mnt_dir) +@pytest.mark.skipif(fuse_proto < (7,11), + reason='not supported by running kernel') def test_ioctl(tmpdir): progname = pjoin(basename, 'example', 'ioctl') if not os.path.exists(progname): |