configure: allow tools/tests build to be disabled

For some builds, e.g. inside a minimal buildroot image, we may not want the
tests to be built. Add an option --disable-tests to configure to disable
building the tests.

Signed-off-by: Christopher Obbard <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>

Author: obbardc

Makefile.am

@@ -417,8 +417,12 @@ clean-local-completion-pycache:
 
 check-valgrind-local: $(GEN_VERSION_H)
 
-# Tests depend on libraries being built - start with "."
-SUBDIRS = . tools/tests
+SUBDIRS = .
+
+# Only include tools/tests if tests are enabled
+if BUILD_TESTS
+SUBDIRS += tools/tests
+endif
 
 FORCE:
 

configure.ac

@@ -261,7 +261,16 @@ AS_IF([test "x$enable_bootloader" != "xno"],
     ])
 AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])
 
-PKG_CHECK_MODULES(LIBCHECK, check)
+AC_ARG_ENABLE([tests],
+    [AS_HELP_STRING([--disable-tests], [Disable building tests])],
+    [], [enable_tests=yes])
+
+AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])
+
+# Only include libcheck if tests are enabled
+if test "x$enable_tests" != "xno"; then
+	PKG_CHECK_MODULES(LIBCHECK, check)
+fi
 
 PKG_INSTALLDIR
 AC_SUBST(LIBEBGENV_VERSION, $(echo $VERSION | cut -dv -f2))
@@ -290,10 +299,14 @@ AX_VALGRIND_CHECK
 # ------------------------------------------------------------------------------
 AC_CONFIG_FILES([
 	Makefile
-	tools/tests/Makefile
 	libebgenv.pc
 ])
 
+# Only configure tools/tests/Makefile if tests are enabled
+if test "x$enable_tests" != "xno"; then
+    AC_CONFIG_FILES([tools/tests/Makefile])
+fi
+
 AC_OUTPUT
 AC_MSG_RESULT([
 	$PACKAGE_NAME $VERSION

tools/tests/Makefile.am

@@ -11,6 +11,7 @@
 #
 # SPDX-License-Identifier:	GPL-2.0-only
 #
+if BUILD_TESTS
 
 OBJCOPY ?= objcopy
 
@@ -110,3 +111,5 @@ test_fat_LDADD = $(FAT_TESTLIB) $(LIBCHECK_LIBS)
 TESTS = $(check_PROGRAMS)
 
 @VALGRIND_CHECK_RULES@
+
+endif