From 324d2cdda4cc7d16fe9adc443912728b039d5628 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 27 Jun 2016 15:40:31 +0200 Subject: [PATCH] domaincapstest: Don't read data from host virQEMUCapsFillDomainCaps would use virHostCPUGetKVMMaxVCPUs for KVM domains. Signed-off-by: Jiri Denemark --- tests/Makefile.am | 7 +++++++ tests/domaincapsmock.c | 26 ++++++++++++++++++++++++++ tests/domaincapstest.c | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tests/domaincapsmock.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 444e0fddfb..16395403da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -404,6 +404,7 @@ test_libraries = libshunload.la \ virrandommock.la \ virhostcpumock.la \ nssmock.la \ + domaincapsmock.la \ $(NULL) if WITH_QEMU test_libraries += libqemumonitortestutils.la \ @@ -919,6 +920,12 @@ vircaps2xmltest_SOURCES = \ vircaps2xmltest.c testutils.h testutils.c vircaps2xmltest_LDADD = $(LDADDS) + +domaincapsmock_la_SOURCES = domaincapsmock.c +domaincapsmock_la_CFLAGS = $(AM_CFLAGS) +domaincapsmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +domaincapsmock_la_LIBADD = $(MOCKLIBS_LIBS) + domaincapstest_SOURCES = \ domaincapstest.c testutils.h testutils.c domaincapstest_LDADD = $(LDADDS) diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c new file mode 100644 index 0000000000..838bc6f3cb --- /dev/null +++ b/tests/domaincapsmock.c @@ -0,0 +1,26 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include +#include + +#include "virhostcpu.h" + +int +virHostCPUGetKVMMaxVCPUs(void) +{ + return INT_MAX; +} diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 01ebfcc313..efd47695d8 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -386,4 +386,4 @@ mymain(void) return ret; } -VIRT_TEST_MAIN(mymain) +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so")