openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup: Only include testutils.h once 

No reason to include it in both "if" and "else" branches.
This commit is contained in:
Osier Yang 2013-04-16 21:41:44 +08:00
parent 0cb171f60f
commit 2beae9c202
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/domainsnapshotxml2xmltest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "qemu/qemu_conf.h" # include "qemu/qemu_conf.h"
# include "qemu/qemu_domain.h" # include "qemu/qemu_domain.h"
# include "testutilsqemu.h" # include "testutilsqemu.h"
@ -125,7 +126,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int int
main(void) main(void)

4
tests/esxutilstest.c
View File

@ -1,5 +1,7 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef WITH_ESX #ifdef WITH_ESX
# include <stdio.h> # include <stdio.h>
@ -8,7 +10,6 @@
# include "internal.h" # include "internal.h"
# include "viralloc.h" # include "viralloc.h"
# include "testutils.h"
# include "virutil.h" # include "virutil.h"
# include "vmx/vmx.h" # include "vmx/vmx.h"
# include "esx/esx_util.h" # include "esx/esx_util.h"
@ -279,7 +280,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/lxcxml2xmltest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_LXC #ifdef WITH_LXC
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "lxc/lxc_conf.h" # include "lxc/lxc_conf.h"
# include "testutilslxc.h" # include "testutilslxc.h"
@ -136,7 +137,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int int
main(void) main(void)

4
tests/openvzutilstest.c
View File

@ -1,5 +1,7 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef WITH_OPENVZ #ifdef WITH_OPENVZ
# include <stdio.h> # include <stdio.h>
@ -8,7 +10,6 @@
# include "internal.h" # include "internal.h"
# include "viralloc.h" # include "viralloc.h"
# include "testutils.h"
# include "virutil.h" # include "virutil.h"
# include "openvz/openvz_conf.h" # include "openvz/openvz_conf.h"
@ -160,7 +161,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/qemuargv2xmltest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "qemu/qemu_command.h" # include "qemu/qemu_command.h"
# include "testutilsqemu.h" # include "testutilsqemu.h"
@ -260,7 +261,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int int
main(void) main(void)

4
tests/qemuhelptest.c
View File

@ -1,11 +1,12 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include <stdio.h> # include <stdio.h>
# include <stdlib.h> # include <stdlib.h>
# include "testutils.h"
# include "qemu/qemu_capabilities.h" # include "qemu/qemu_capabilities.h"
# include "viralloc.h" # include "viralloc.h"
@ -1034,7 +1035,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/qemumonitortest.c
View File

@ -5,11 +5,12 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "viralloc.h" # include "viralloc.h"
# include "testutils.h"
# include "virutil.h" # include "virutil.h"
# include "qemu/qemu_monitor.h" # include "qemu/qemu_monitor.h"
@ -108,7 +109,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/qemuxml2argvtest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "viralloc.h" # include "viralloc.h"
# include "qemu/qemu_capabilities.h" # include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h" # include "qemu/qemu_command.h"
@ -951,7 +952,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/qemuxml2xmltest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "qemu/qemu_conf.h" # include "qemu/qemu_conf.h"
# include "qemu/qemu_domain.h" # include "qemu/qemu_domain.h"
# include "testutilsqemu.h" # include "testutilsqemu.h"
@ -285,7 +286,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int int
main(void) main(void)

4
tests/qemuxmlnstest.c
View File

@ -8,10 +8,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "testutils.h"
#ifdef WITH_QEMU #ifdef WITH_QEMU
# include "internal.h" # include "internal.h"
# include "testutils.h"
# include "qemu/qemu_capabilities.h" # include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h" # include "qemu/qemu_command.h"
# include "qemu/qemu_domain.h" # include "qemu/qemu_domain.h"
@ -263,7 +264,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/shunloadtest.c
View File

@ -40,6 +40,8 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef linux #ifdef linux
# include <dlfcn.h> # include <dlfcn.h>
@ -50,7 +52,6 @@
# include <signal.h> # include <signal.h>
# include "internal.h" # include "internal.h"
# include "testutils.h"
pthread_cond_t cond = PTHREAD_COND_INITIALIZER; pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
@ -143,7 +144,6 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv)
} }
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/vmx2xmltest.c
View File

@ -1,5 +1,7 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef WITH_VMX #ifdef WITH_VMX
# include <stdio.h> # include <stdio.h>
@ -8,7 +10,6 @@
# include "internal.h" # include "internal.h"
# include "viralloc.h" # include "viralloc.h"
# include "testutils.h"
# include "vmx/vmx.h" # include "vmx/vmx.h"
static virCapsPtr caps; static virCapsPtr caps;
@ -298,7 +299,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {

4
tests/xml2vmxtest.c
View File

@ -1,5 +1,7 @@
#include <config.h> #include <config.h>
#include "testutils.h"
#ifdef WITH_VMX #ifdef WITH_VMX
# include <stdio.h> # include <stdio.h>
@ -8,7 +10,6 @@
# include "internal.h" # include "internal.h"
# include "viralloc.h" # include "viralloc.h"
# include "testutils.h"
# include "vmx/vmx.h" # include "vmx/vmx.h"
static virCapsPtr caps; static virCapsPtr caps;
@ -311,7 +312,6 @@ mymain(void)
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
#else #else
# include "testutils.h"
int main(void) int main(void)
{ {