From: Michael Jeanson Date: Tue, 27 Feb 2024 21:43:19 +0000 (-0500) Subject: Fix: seccomp tests require shared libs X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=71884a4b1f9167e6698cf4875943af2795cfa4c7;p=librseq.git Fix: seccomp tests require shared libs Disable the seccomp dependent tests when the project is built without shared library support. Change-Id: If17caf056c612a22b649281f25775f55546074f1 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/configure.ac b/configure.ac index 9b8a33c..ac0883f 100644 --- a/configure.ac +++ b/configure.ac @@ -206,7 +206,8 @@ AE_FEATURE([Werror], [Treat compiler warnings as errors.]) ## Set automake variables for optional feature conditionnals in Makefile.am ## ## ## -AM_CONDITIONAL([ENABLE_SECCOMP], test "x${have_seccomp}" = "xyes") +AM_CONDITIONAL([ENABLE_SHARED], [test "x${enable_shared}" = "xyes"]) +AM_CONDITIONAL([ENABLE_SECCOMP], [test "x${have_seccomp}" = "xyes"]) ## ## diff --git a/tests/Makefile.am b/tests/Makefile.am index 85e546b..67da31a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,6 +44,7 @@ dist_noinst_SCRIPTS = \ run_unregistered_test_cxx.tap \ run_unregistered_test.tap +if ENABLE_SHARED if ENABLE_SECCOMP noinst_LTLIBRARIES = libdisable-rseq-syscall.la @@ -51,6 +52,7 @@ libdisable_rseq_syscall_la_SOURCES = disable-rseq-syscall.c libdisable_rseq_syscall_la_LDFLAGS = -module -shared -avoid-version -rpath $(abs_builddir)/.libs/ libdisable_rseq_syscall_la_LIBADD = $(SECCOMP_LIBS) endif +endif basic_percpu_ops_test_tap_SOURCES = basic_percpu_ops_test.c basic_percpu_ops_test_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS) @@ -137,11 +139,13 @@ TESTS = \ run_unregistered_test.tap \ run_unregistered_test_cxx.tap +if ENABLE_SHARED if ENABLE_SECCOMP TESTS += \ run_no_syscall_test.tap \ run_no_syscall_test_cxx.tap endif +endif # Run longer tests last TESTS += \