Fix meson tests build

This commit is contained in:
Lzu Tao 2018-11-28 12:16:09 +07:00
parent 5a36a57cf5
commit c9f0144302
2 changed files with 6 additions and 5 deletions

View File

@ -103,6 +103,7 @@ endif
# ============================================================================= # =============================================================================
subdir('lib') subdir('lib')
if enable_programs if enable_programs
subdir('programs') subdir('programs')
endif endif

View File

@ -31,7 +31,7 @@ fullbench_sources = [datagen_c_file,
util_c_file, util_c_file,
benchfn_c_file, benchfn_c_file,
join_paths(programs_dir, 'benchzstd.c'), join_paths(programs_dir, 'benchzstd.c'),
join_paths(programs_dir, 'fullbench.c')] join_paths(tests_dir, 'fullbench.c')]
fullbench = executable('fullbench', fullbench = executable('fullbench',
fullbench_sources, fullbench_sources,
include_directories: test_includes, include_directories: test_includes,
@ -49,10 +49,10 @@ fuzzer = executable('fuzzer',
install: false) install: false)
test('fuzzer', fuzzer) test('fuzzer', fuzzer)
paramgrill_sources = [benchfn_c_file paramgrill_sources = [benchfn_c_file,
join_paths(programs_dir, 'benchzstd.c'), join_paths(programs_dir, 'benchzstd.c'),
datagen_c_file datagen_c_file,
util_c_file util_c_file,
join_paths(tests_dir, 'paramgrill.c')] join_paths(tests_dir, 'paramgrill.c')]
if host_machine.system() != 'windows' if host_machine.system() != 'windows'
paramgrill = executable('paramgrill', paramgrill = executable('paramgrill',
@ -60,6 +60,6 @@ if host_machine.system() != 'windows'
include_directories: test_includes, include_directories: test_includes,
link_with: libzstd, link_with: libzstd,
dependencies: libm_dep, dependencies: libm_dep,
install: false ) install: false)
test('paramgrill', paramgrill) test('paramgrill', paramgrill)
endif endif