From e9ca5c92d2b3fdda27ff194869268562c237b043 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 12 May 2024 19:49:29 +0200
Subject: [PATCH] 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
---
 tests/functional/common/vars-and-functions.sh.in | 2 --
 tests/functional/meson.build                     | 7 +++++--
 tests/functional/plugins.sh                      | 4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/functional/common/vars-and-functions.sh.in b/tests/functional/common/vars-and-functions.sh.in
index 3d2e44024..3b343b720 100644
--- a/tests/functional/common/vars-and-functions.sh.in
+++ b/tests/functional/common/vars-and-functions.sh.in
@@ -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
 
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index d0966a60c..1e68cfe8c 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -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(
diff --git a/tests/functional/plugins.sh b/tests/functional/plugins.sh
index 5934b9b0c..1b6528f3b 100644
--- a/tests/functional/plugins.sh
+++ b/tests/functional/plugins.sh
@@ -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