tests: Use the new test skipping facility everywhere
This commit is contained in:
parent
28e491c706
commit
e36183aab4
|
@ -1,25 +1,22 @@
|
||||||
project('D library versions', 'd')
|
project('D library versions', 'd')
|
||||||
|
|
||||||
if meson.get_compiler('d').get_id() == 'gcc'
|
if meson.get_compiler('d').get_id() == 'gcc'
|
||||||
message('GDC can not build shared libraries. Test skipped.')
|
error('MESON_SKIP_TEST: GDC can not build shared libraries')
|
||||||
install_data('no-installed-files', install_dir : '')
|
|
||||||
else
|
|
||||||
|
|
||||||
shared_library('some', 'lib.d',
|
|
||||||
version : '1.2.3',
|
|
||||||
soversion : '0',
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
shared_library('noversion', 'lib.d',
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
shared_library('onlyversion', 'lib.d',
|
|
||||||
version : '1.4.5',
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
shared_library('onlysoversion', 'lib.d',
|
|
||||||
# Also test that int soversion is acceptable
|
|
||||||
soversion : 5,
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
shared_library('some', 'lib.d',
|
||||||
|
version : '1.2.3',
|
||||||
|
soversion : '0',
|
||||||
|
install : true)
|
||||||
|
|
||||||
|
shared_library('noversion', 'lib.d',
|
||||||
|
install : true)
|
||||||
|
|
||||||
|
shared_library('onlyversion', 'lib.d',
|
||||||
|
version : '1.4.5',
|
||||||
|
install : true)
|
||||||
|
|
||||||
|
shared_library('onlysoversion', 'lib.d',
|
||||||
|
# Also test that int soversion is acceptable
|
||||||
|
soversion : 5,
|
||||||
|
install : true)
|
||||||
|
|
|
@ -2,16 +2,16 @@ project('mingw dll versioning', 'c')
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
|
|
||||||
|
if cc.get_id() == 'msvc'
|
||||||
|
error('MESON_SKIP_TEST: test is only for MinGW')
|
||||||
|
endif
|
||||||
|
|
||||||
# Test that MinGW/GCC creates correctly-named dll files and dll.a files,
|
# Test that MinGW/GCC creates correctly-named dll files and dll.a files,
|
||||||
# and also installs them in the right place
|
# and also installs them in the right place
|
||||||
if cc.get_id() != 'msvc'
|
shared_library('some', 'lib.c',
|
||||||
shared_library('some', 'lib.c',
|
version : '1.2.3',
|
||||||
version : '1.2.3',
|
soversion : '0',
|
||||||
soversion : '0',
|
install : true)
|
||||||
install : true)
|
|
||||||
|
|
||||||
shared_library('noversion', 'lib.c',
|
shared_library('noversion', 'lib.c',
|
||||||
install : true)
|
install : true)
|
||||||
else
|
|
||||||
install_data('no-installed-files', install_dir : '')
|
|
||||||
endif
|
|
||||||
|
|
|
@ -2,15 +2,15 @@ project('msvc dll versioning', 'c')
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
|
|
||||||
# Test that MSVC creates foo-0.dll and bar.dll
|
if cc.get_id() != 'msvc'
|
||||||
if cc.get_id() == 'msvc'
|
error('MESON_SKIP_TEST: test is only for msvc')
|
||||||
shared_library('some', 'lib.c',
|
|
||||||
version : '1.2.3',
|
|
||||||
soversion : '0',
|
|
||||||
install : true)
|
|
||||||
|
|
||||||
shared_library('noversion', 'lib.c',
|
|
||||||
install : true)
|
|
||||||
else
|
|
||||||
install_data('no-installed-files', install_dir : '')
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Test that MSVC creates foo-0.dll and bar.dll
|
||||||
|
shared_library('some', 'lib.c',
|
||||||
|
version : '1.2.3',
|
||||||
|
soversion : '0',
|
||||||
|
install : true)
|
||||||
|
|
||||||
|
shared_library('noversion', 'lib.c',
|
||||||
|
install : true)
|
||||||
|
|
Loading…
Reference in New Issue