Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-driver-test.m4 | 33 --------------------------------- meson.build | 5 +++++ meson_options.txt | 1 + 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 m4/virt-driver-test.m4 diff --git a/configure.ac b/configure.ac index d0189c8701a..ab1b2145756 100644 --- a/configure.ac +++ b/configure.ac @@ -105,14 +105,12 @@ dnl LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -311,7 +309,6 @@ AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ -LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-test.m4 b/m4/virt-driver-test.m4 deleted file mode 100644 index 460d1f4aeea..00000000000 --- a/m4/virt-driver-test.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The test driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_TEST], [ - LIBVIRT_ARG_WITH_FEATURE([TEST], [test driver], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_TEST], [ - if test "$with_test" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) - fi - AM_CONDITIONAL([WITH_TEST], [test "$with_test" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_TEST], [ - LIBVIRT_RESULT([Test], [$with_test]) -]) diff --git a/meson.build b/meson.build index b7710bd0fcb..6a32554bb41 100644 --- a/meson.build +++ b/meson.build @@ -1804,6 +1804,10 @@ if not get_option('driver_qemu').disabled() endif endif +if get_option('driver_test').enabled() + conf.set('WITH_TEST', 1) +endif + # define top include directory @@ -1831,6 +1835,7 @@ driver_summary = { 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), + 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), } diff --git a/meson_options.txt b/meson_options.txt index 4f8cddd0aee..f9f9e3f79fe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -59,3 +59,4 @@ option('qemu_user', type: 'string', value: '', description: 'username to run QEM option('qemu_group', type: 'string', value: '', description: 'groupname to run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') +option('driver_test', type: 'feature', value: 'enabled', description: 'test driver') -- 2.26.2
