mirror of https://gitee.com/openkylin/libvirt.git
cleanup: Only include testutils.h once
No reason to include it in both "if" and "else" branches.
This commit is contained in:
parent
0cb171f60f
commit
2beae9c202
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "qemu/qemu_conf.h"
|
||||
# include "qemu/qemu_domain.h"
|
||||
# include "testutilsqemu.h"
|
||||
|
@ -125,7 +126,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int
|
||||
main(void)
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_ESX
|
||||
|
||||
# include <stdio.h>
|
||||
|
@ -8,7 +10,6 @@
|
|||
|
||||
# include "internal.h"
|
||||
# include "viralloc.h"
|
||||
# include "testutils.h"
|
||||
# include "virutil.h"
|
||||
# include "vmx/vmx.h"
|
||||
# include "esx/esx_util.h"
|
||||
|
@ -279,7 +280,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_LXC
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "lxc/lxc_conf.h"
|
||||
# include "testutilslxc.h"
|
||||
|
||||
|
@ -136,7 +137,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int
|
||||
main(void)
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_OPENVZ
|
||||
|
||||
# include <stdio.h>
|
||||
|
@ -8,7 +10,6 @@
|
|||
|
||||
# include "internal.h"
|
||||
# include "viralloc.h"
|
||||
# include "testutils.h"
|
||||
# include "virutil.h"
|
||||
# include "openvz/openvz_conf.h"
|
||||
|
||||
|
@ -160,7 +161,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "qemu/qemu_command.h"
|
||||
|
||||
# include "testutilsqemu.h"
|
||||
|
@ -260,7 +261,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int
|
||||
main(void)
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
|
||||
# include "testutils.h"
|
||||
# include "qemu/qemu_capabilities.h"
|
||||
# include "viralloc.h"
|
||||
|
||||
|
@ -1034,7 +1035,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -5,11 +5,12 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "viralloc.h"
|
||||
# include "testutils.h"
|
||||
# include "virutil.h"
|
||||
# include "qemu/qemu_monitor.h"
|
||||
|
||||
|
@ -108,7 +109,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "viralloc.h"
|
||||
# include "qemu/qemu_capabilities.h"
|
||||
# include "qemu/qemu_command.h"
|
||||
|
@ -951,7 +952,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "qemu/qemu_conf.h"
|
||||
# include "qemu/qemu_domain.h"
|
||||
# include "testutilsqemu.h"
|
||||
|
@ -285,7 +286,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int
|
||||
main(void)
|
||||
|
|
|
@ -8,10 +8,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_QEMU
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
# include "qemu/qemu_capabilities.h"
|
||||
# include "qemu/qemu_command.h"
|
||||
# include "qemu/qemu_domain.h"
|
||||
|
@ -263,7 +264,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
|
||||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef linux
|
||||
|
||||
# include <dlfcn.h>
|
||||
|
@ -50,7 +52,6 @@
|
|||
# include <signal.h>
|
||||
|
||||
# include "internal.h"
|
||||
# include "testutils.h"
|
||||
|
||||
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
||||
pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
@ -143,7 +144,6 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv)
|
|||
}
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_VMX
|
||||
|
||||
# include <stdio.h>
|
||||
|
@ -8,7 +10,6 @@
|
|||
|
||||
# include "internal.h"
|
||||
# include "viralloc.h"
|
||||
# include "testutils.h"
|
||||
# include "vmx/vmx.h"
|
||||
|
||||
static virCapsPtr caps;
|
||||
|
@ -298,7 +299,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include <config.h>
|
||||
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef WITH_VMX
|
||||
|
||||
# include <stdio.h>
|
||||
|
@ -8,7 +10,6 @@
|
|||
|
||||
# include "internal.h"
|
||||
# include "viralloc.h"
|
||||
# include "testutils.h"
|
||||
# include "vmx/vmx.h"
|
||||
|
||||
static virCapsPtr caps;
|
||||
|
@ -311,7 +312,6 @@ mymain(void)
|
|||
VIRT_TEST_MAIN(mymain)
|
||||
|
||||
#else
|
||||
# include "testutils.h"
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue