Merge pull request #193 from keszybz/fuzz

oss-fuzz hookup

Author: poettering

meson.build

@@ -8,8 +8,9 @@ project('casync', 'c',
                 'prefix=/usr',
                 'sysconfdir=/etc',
                 'localstatedir=/var',
+                'auto_features=enabled',
         ],
-        meson_version : '>= 0.40')
+        meson_version : '>= 0.47')
 
 cc = meson.get_compiler('c')
 
@@ -62,6 +63,15 @@ foreach arg : c_args
         endif
 endforeach
 
+want_ossfuzz = get_option('oss-fuzz')
+want_libfuzzer = get_option('llvm-fuzz')
+if want_ossfuzz and want_libfuzzer
+        error('only one of oss-fuzz and llvm-fuzz can be specified')
+endif
+fuzzer_build = want_ossfuzz or want_libfuzzer
+
+add_languages('cpp', required : fuzzer_build)
+
 conf = configuration_data()
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 
@@ -101,18 +111,27 @@ docdir = join_paths(datadir, 'doc/casync')
 protocoldir = join_paths(prefixdir, 'lib/casync/protocols')
 conf.set_quoted('CASYNC_PROTOCOL_PATH', protocoldir)
 
-liblzma = dependency('liblzma',
-                     version : '>= 5.1.0')
+liblzma = dependency(
+        'liblzma',
+        version : '>= 5.1.0',
+        required : get_option('liblzma'))
+conf.set10('HAVE_LIBLZMA', liblzma.found())
+
+libz = dependency(
+        'zlib',
+        required : get_option('libz'))
+conf.set10('HAVE_LIBZ', libz.found())
+
+libzstd = dependency(
+        'libzstd',
+        version : '>= 0.8.1',
+        required : get_option('libzstd'))
+conf.set10('HAVE_LIBZSTD', libzstd.found())
+
 libcurl = dependency('libcurl',
                      version : '>= 7.29.0')
 openssl = dependency('openssl',
                      version : '>= 1.0')
-
-libz = dependency('zlib')
-
-libzstd = dependency('libzstd',
-                      version : '>= 0.8.1')
-
 libacl = cc.find_library('acl')
 
 if get_option('fuse')
@@ -140,6 +159,12 @@ conf.set10('HAVE_UDEV', get_option('udev'))
 threads = dependency('threads')
 math = cc.find_library('m')
 
+if want_libfuzzer
+        fuzzing_engine = meson.get_compiler('cpp').find_library('Fuzzer')
+elif want_ossfuzz
+        fuzzing_engine = meson.get_compiler('cpp').find_library('FuzzingEngine')
+endif
+
 config_h = configure_file(
         output : 'config.h',
         configuration : conf)
@@ -227,6 +252,9 @@ substs = configuration_data()
 substs.set_quoted('top_builddir', meson.build_root())
 substs.set_quoted('top_srcdir', meson.source_root())
 substs.set('bindir_unquoted', bindir)
+substs.set10('HAVE_LIBLZMA', liblzma.found())
+substs.set10('HAVE_LIBZ',    libz.found())
+substs.set10('HAVE_LIBZSTD', libzstd.found())
 
 test_script_sh = configure_file(
         output : 'test-script.sh',
@@ -315,28 +343,57 @@ non_test_sources = '''
         test-calc-digest
 '''.split()
 
+test_dependencies = [
+        libacl,
+        liblzma,
+        libselinux,
+        libz,
+        libzstd,
+        math,
+        openssl,
+        threads]
+
 foreach test_name : test_sources + non_test_sources
         exe = executable(
                 test_name,
                 'test/@[email protected]'.format(test_name),
-                link_with : libshared,
                 include_directories : includes,
-                dependencies : [
-                        libacl,
-                        liblzma,
-                        libselinux,
-                        libz,
-                        libzstd,
-                        math,
-                        openssl,
-                        threads])
+                link_with : libshared,
+                dependencies : test_dependencies)
 
         if test_sources.contains(test_name)
                 test(test_name, exe,
                      timeout : 3 * 60)
         endif
 endforeach
 
+fuzzer_exes = []
+
+foreach tuple : fuzzers
+        sources = tuple[0]
+
+        deps = test_dependencies
+        if fuzzer_build
+                deps += fuzzing_engine
+        else
+                sources += fuzz_main_c
+        endif
+
+        name = sources[0].split('/')[-1].split('.')[0]
+
+        fuzzer_exes += executable(
+                name,
+                sources,
+                include_directories : [includes, include_directories('test/fuzz')],
+                link_with : libshared,
+                dependencies : deps,
+                install : false)
+endforeach
+
+run_target('fuzzers',
+        depends : fuzzer_exes,
+        command : ['true'])
+
 ############################################################
 
 meson_check_help = find_program('test/meson-check-help.sh')

meson_options.txt

@@ -11,3 +11,14 @@ option('udevrulesdir', type : 'string', value: '',
        description: 'Path where udev rules are installed to (Defaults to udevdir specified in udev.pc)')
 option('man', type : 'boolean', value : true,
        description : 'build and install man pages (requires sphinx-build')
+option('libzstd', type : 'feature',
+       description : 'link to libzstd')
+option('liblzma', type : 'feature',
+       description : 'link to liblzma (for XZ compression)')
+option('libz', type : 'feature',
+       description : 'link to zlib')
+
+option('oss-fuzz', type : 'boolean', value : 'false',
+       description : 'build against oss-fuzz')
+option('llvm-fuzz', type : 'boolean', value : 'false',
+       description : 'build against LLVM libFuzzer')