From f988ce2fd53c0f8cf9d1e676e7c1b1175000978e Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Fri, 24 Jul 2020 16:04:19 +0200 Subject: [PATCH] meson: drop test_suite configure argument With autoconf this option controlled if the test suite is compiled by default or not with the fact that it will be compiled later when running `make check`. With meson it is not possible to compile it later when running `ninja test` as it will be always compiled if referenced by `test()` function in meson.build files. Since we cannot postpone compilation of the test suite drop this option as it will not be converted to meson. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- configure.ac | 17 ----------------- tests/Makefile.am | 9 --------- 2 files changed, 26 deletions(-) diff --git a/configure.ac b/configure.ac index 33bd203e56..7acf3f2fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -729,23 +729,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi -LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check]) -case "$with_test_suite" in - yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; -esac - -AC_MSG_CHECKING([Whether to build test suite by default]) -if test "$with_test_suite" = "check" ; then - if test -d $srcdir/.git ; then - with_test_suite=yes - else - with_test_suite=no - fi -fi -AC_MSG_RESULT([$with_test_suite]) -AM_CONDITIONAL([WITH_TESTS], [test "$with_test_suite" = "yes"]) - LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], [set the default for enabling expensive tests ] [(long timeouts), use VIR_TEST_EXPENSIVE to ] diff --git a/tests/Makefile.am b/tests/Makefile.am index 415b875ec4..00a6276ec0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -362,13 +362,8 @@ file-access-clean: > test_file_access.txt endif WITH_LINUX -if WITH_TESTS noinst_PROGRAMS = $(test_programs) $(test_helpers) noinst_LTLIBRARIES = $(test_libraries) -else ! WITH_TESTS -check_PROGRAMS = $(test_programs) $(test_helpers) -check_LTLIBRARIES = $(test_libraries) -endif ! WITH_TESTS TESTS = $(test_programs) \ $(test_scripts) @@ -1256,11 +1251,7 @@ seclabeltest_LDADD = $(LDADDS) if WITH_SECDRIVER_SELINUX if WITH_ATTR -if WITH_TESTS noinst_LTLIBRARIES += libsecurityselinuxhelper.la -else ! WITH_TESTS -check_LTLIBRARIES += libsecurityselinuxhelper.la -endif ! WITH_TESTS libsecurityselinuxhelper_la_SOURCES = \ securityselinuxhelper.c -- 2.47.2