meson: add test driver build option

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 7b579930a383d63fb84cf1106ef1059d9aa87c0b..528ed119c0f83e159237967c38d5bb6821c71689 100644 (file)
--- 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
 
@@ -309,7 +307,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 (file)
index 460d1f4..0000000
--- 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 e49f197be2520787b45a08f6287fbfd71daa87d7..a28c62118f2428077c95489bbc0d4ec2a1f78962 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1822,6 +1822,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
 
@@ -1849,6 +1853,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 c17045cfee6f3d54b400aab640093b441f372812..f94d76b48995b2ec4dabca17eebef153bcda2eb8 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -60,3 +60,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')