tests: don't build test plugin shared libs on static builds
This changes the way plugins.sh is excluded to remove the need for BUILD_SHARED_LIBS along the way. Change-Id: I19fe55b4a37c49a11fffa61c8a3be7e8d1a51b4d
This commit is contained in:
parent
4b35e6a75e
commit
e9ca5c92d2
3 changed files with 5 additions and 8 deletions
|
@ -54,8 +54,6 @@ export busybox="@sandbox_shell@"
|
|||
export version=@PACKAGE_VERSION@
|
||||
export system=@system@
|
||||
|
||||
export BUILD_SHARED_LIBS=@BUILD_SHARED_LIBS@
|
||||
|
||||
export IMPURE_VAR1=foo
|
||||
export IMPURE_VAR2=bar
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ test_confdata = {
|
|||
'sandbox_shell': busybox.found() ? busybox.full_path() : '',
|
||||
'PACKAGE_VERSION': meson.project_version(),
|
||||
'system': host_system,
|
||||
'BUILD_SHARED_LIBS': '1', # XXX(Qyriad): detect this!
|
||||
}
|
||||
|
||||
# Just configures `common/vars-and-functions.sh.in`.
|
||||
|
@ -180,11 +179,15 @@ functional_tests_scripts = [
|
|||
'read-only-store.sh',
|
||||
'nested-sandboxing.sh',
|
||||
'debugger.sh',
|
||||
'plugins.sh',
|
||||
'test-libstoreconsumer.sh',
|
||||
'extra-sandbox-profile.sh',
|
||||
]
|
||||
|
||||
# Plugin tests require shared libraries support.
|
||||
if get_option('default_library') != 'static'
|
||||
functional_tests_scripts += ['plugins.sh']
|
||||
endif
|
||||
|
||||
# TODO(Qyriad): this will hopefully be able to be removed when we remove the autoconf+Make
|
||||
# buildsystem. See the comments at the top of setup-functional-tests.py for why this is here.
|
||||
meson.add_install_script(
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
source common.sh
|
||||
|
||||
if [[ $BUILD_SHARED_LIBS != 1 ]]; then
|
||||
skipTest "Plugins are not supported"
|
||||
fi
|
||||
|
||||
# FIXME(Qyriad): this is working around Meson putting `libplugintest.so.p` in the same place
|
||||
# as `libplugintest.so`, so `libplugintest.*` grabs both.
|
||||
libext=so
|
||||
|
|
Loading…
Reference in a new issue