1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-14 23:32:27 +00:00

[tests] fixes

This commit is contained in:
Witold Filipczyk 2022-10-08 11:05:15 +02:00
parent 88c82224b0
commit a801578d27
3 changed files with 28 additions and 7 deletions

View File

@ -880,9 +880,21 @@ configure_file(input : 'config2.h.in',
output : 'config.h',
configuration : conf_data)
testdeps = files('src/intl/charsets.c', 'src/intl/width.c', 'src/osdep/stub.c', 'src/util/conv.c', 'src/util/error.c', 'src/util/fastfind.c',
testdeps = files('src/intl/charsets.c', 'src/osdep/stub.c', 'src/util/conv.c', 'src/util/error.c',
'src/util/file.c', 'src/util/hash.c', 'src/util/memory.c', 'src/util/string.c', 'src/util/time.c')
if conf_data.get('CONFIG_DEBUG')
testdeps += files('src/util/memdebug.c')
endif
if conf_data.get('CONFIG_UTF8')
testdeps += files('src/intl/width.c')
endif
if not conf_data.get('CONFIG_SMALL')
testdeps += files('src/util/fastfind.c')
endif
subdir('po')
subdir('src')
subdir('contrib')

View File

@ -7,8 +7,4 @@ test('cookies', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir(
parsetstdeps = files('parser.c', 'parsetst.c')
if conf_data.get('CONFIG_DEBUG')
parsetsdeps += files(meson.source_root()+'/src/util/memdebug.c')
endif
executable('parsetst', parsetstdeps, testdeps, c_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..'])

View File

@ -1,5 +1,9 @@
idna_dep = dependency('libidn')
exe = executable('uri-test', 'uri-test.c', 'stub.c', meson.current_source_dir()+'/../protocol.cpp', meson.current_source_dir()+'/../uri.c',
uri_test_files = files('uri-test.c', 'stub.c', meson.current_source_dir()+'/../protocol.cpp', meson.current_source_dir()+'/../uri.c')
if conf_data.get('CONFIG_NLS') and not conf_data.get('CONFIG_GETTEXT')
uri_test_files += files(
meson.source_root()+'/src/intl/gettext/bindtextdom.c',
meson.source_root()+'/src/intl/gettext/dcgettext.c',
meson.source_root()+'/src/intl/gettext/dcigettext.c',
@ -17,7 +21,16 @@ meson.source_root()+'/src/intl/gettext/localcharset.c',
meson.source_root()+'/src/intl/gettext/localealias.c',
meson.source_root()+'/src/intl/gettext/ngettext.c',
meson.source_root()+'/src/intl/gettext/plural.c',
meson.source_root()+'/src/intl/gettext/textdomain.c',
meson.source_root()+'/src/intl/gettext/textdomain.c')
endif
if conf_data.get('CONFIG_NLS') and conf_data.get('CONFIG_GETTEXT')
uri_test_files += files(
meson.source_root()+'/src/intl/libintl.c',
meson.source_root()+'/src/util/env.c')
endif
exe = executable('uri-test', uri_test_files,
testdeps, dependencies: [idna_dep],
c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..'])
t = find_program('test-normalize-uri')