[libvirt] [PATCH 2/4] tests: Fix qemumemlocktest on FreeBSD
Daniel P. Berrangé
berrange at redhat.com
Fri Apr 27 15:35:12 UTC 2018
On Fri, Apr 27, 2018 at 05:21:21PM +0200, Andrea Bolognani wrote:
> When hostdevs are involved, libvirt needs to poke into sysfs to
> collect some information about them; since that pseudo-filesystem
> doesn't exist on platforms other than Linux, the corresponding
> tests would fail and need to be compiled out.
Our test suite isn't supposed to touch /sysfs from the real
host at all. Sounds like we either need to mock out the
function that's doing that, or provide some fake sysfs data
in a tests/ subdirectory to run against with a mock'd open()
call. That would make it work even on non-Linux I hope.
Same for the other 2 patches following this.
>
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
> tests/qemumemlocktest.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
> index bc0b53e6fa..1e5d06ea96 100644
> --- a/tests/qemumemlocktest.c
> +++ b/tests/qemumemlocktest.c
> @@ -120,12 +120,18 @@ mymain(void)
>
> DO_TEST("pc-hardlimit", 2147483648);
> DO_TEST("pc-locked", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED);
> +
> +# ifdef __linux__
> DO_TEST("pc-hostdev", 2147483648);
> +# endif /* __linux */
>
> DO_TEST("pc-hardlimit+locked", 2147483648);
> +
> +# ifdef __linux__
> DO_TEST("pc-hardlimit+hostdev", 2147483648);
> DO_TEST("pc-hardlimit+locked+hostdev", 2147483648);
> DO_TEST("pc-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED);
> +# endif /* __linux */
>
> qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64);
> if (!(qemuCaps = virQEMUCapsNew())) {
> @@ -144,12 +150,18 @@ mymain(void)
>
> DO_TEST("pseries-hardlimit", 2147483648);
> DO_TEST("pseries-locked", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED);
> +
> +# ifdef __linux__
> DO_TEST("pseries-hostdev", 4320133120);
> +# endif /* __linux */
>
> DO_TEST("pseries-hardlimit+locked", 2147483648);
> +
> +# ifdef __linux__
> DO_TEST("pseries-hardlimit+hostdev", 2147483648);
> DO_TEST("pseries-hardlimit+locked+hostdev", 2147483648);
> DO_TEST("pseries-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED);
> +# endif /* __linux */
>
> cleanup:
> virObjectUnref(qemuCaps);
> --
> 2.14.3
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
More information about the libvir-list
mailing list