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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index 9b8a33c893de40aae47339fcaeed3609bbec3ea4..ac0883f3eeacd72a161421980a4be34795c68d68 100644 (file)
--- 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 85e546bda6901a7bb2d6b0c3519f0ae3e456a0ae..67da31a691969b65b694235f653f68b31d304943 100644 (file)
--- 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 += \