From 1dced6d450138318b4839bf59df9b887b1c90424 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 11:34:03 +0200 Subject: [PATCH] meson: tests: add linux specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- tests/Makefile.am | 53 ----------------------------------------------- tests/meson.build | 12 +++++++++++ 2 files changed, 12 insertions(+), 53 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0cca4308ff..d1ddb33313 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,13 +27,6 @@ test_programs += \ $(NULL) endif WITH_REMOTE -if WITH_LINUX -test_programs += fchosttest -test_programs += scsihosttest -test_programs += vircaps2xmltest -test_programs += virresctrltest -endif WITH_LINUX - if WITH_LIBVIRTD test_programs += fdstreamtest endif WITH_LIBVIRTD @@ -139,10 +132,6 @@ if WITH_STORAGE_FS test_programs += virstoragetest endif WITH_STORAGE_FS -if WITH_LINUX -test_programs += virscsitest -endif WITH_LINUX - if WITH_NSS test_helpers += nsslinktest nssguestlinktest test_programs += nsstest nssguesttest @@ -152,12 +141,6 @@ if WITH_NODE_DEVICES test_programs += nodedevmdevctltest endif WITH_NODE_DEVICES -if WITH_LINUX -test_programs += virusbtest \ - virnetdevbandwidthtest \ - $(NULL) -endif WITH_LINUX - test_scripts = libvirtd_test_scripts = \ libvirtd-fail \ @@ -600,16 +583,6 @@ viridentitytest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la endif WITH_SELINUX -if WITH_LINUX -vircaps2xmltest_SOURCES = \ - vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c -vircaps2xmltest_LDADD = $(LDADDS) - -virresctrltest_SOURCES = \ - virresctrltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c -virresctrltest_LDADD = $(LDADDS) -endif WITH_LINUX - if WITH_NSS nsstest_SOURCES = \ nsstest.c testutils.h testutils.c @@ -662,16 +635,6 @@ test_programs += \ virnetdevopenvswitchtest endif WITH_YAJL -if WITH_LINUX -virusbtest_SOURCES = \ - virusbtest.c testutils.h testutils.c -virusbtest_LDADD = $(LDADDS) - -virnetdevbandwidthtest_SOURCES = \ - virnetdevbandwidthtest.c testutils.h testutils.c -virnetdevbandwidthtest_LDADD = $(LDADDS) $(LIBXML_LIBS) -endif WITH_LINUX - if WITH_DBUS virdbustest_SOURCES = \ virdbustest.c testutils.h testutils.c @@ -732,19 +695,3 @@ endif WITH_LIBVIRTD fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) - -if WITH_LINUX -fchosttest_SOURCES = \ - fchosttest.c testutils.h testutils.c -fchosttest_LDADD = $(LDADDS) - -scsihosttest_SOURCES = \ - scsihosttest.c testutils.h testutils.c -scsihosttest_LDADD = $(LDADDS) -endif WITH_LINUX - -if WITH_LINUX -virscsitest_SOURCES = \ - virscsitest.c testutils.h testutils.c -virscsitest_LDADD = $(LDADDS) -endif WITH_LINUX diff --git a/tests/meson.build b/tests/meson.build index c547d81d71..572893d32b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -333,6 +333,18 @@ tests += [ { 'name': 'vshtabletest', 'link_with': [ libvirt_shell_lib ] }, ] +if host_machine.system() == 'linux' + tests += [ + { 'name': 'fchosttest' }, + { 'name': 'scsihosttest' }, + { 'name': 'vircaps2xmltest', 'link_whole': [ test_file_wrapper_lib ] }, + { 'name': 'virnetdevbandwidthtest' }, + { 'name': 'virresctrltest', 'link_whole': [ test_file_wrapper_lib ] }, + { 'name': 'virscsitest' }, + { 'name': 'virusbtest' }, + ] +endif + foreach data : tests test_sources = '@0@.c'.format(data['name']) test_bin = executable(