[libvirt] [PATCH] tests: Fix virnetdaemontest to be skipped in non-yajl environment

Prerna saxenap.ltc at gmail.com
Fri Oct 23 10:08:25 UTC 2015


When libvirt is compiled without yajl-devel, virnetdaemontest fails.
This causes 'make check' to fail with nondescript errors, such as following:
[snip]...............................
PASS: read-bufsiz
PASS: read-non-seekable
PASS: start
TEST: virsh-uriprecedence
       ....                                     4   OK
PASS: virsh-uriprecedence
PASS: vcpupin
/home/prerna/trees/libvirt/tests/virsh-all: skipping test:
This test is very expensive, so it is disabled by default.
To run it anyway, rerun: make check VIR_TEST_EXPENSIVE=1

SKIP: virsh-all
PASS: virsh-optparse
PASS: virsh-schedinfo
PASS: virsh-synopsis
PASS: virsh-undefine
=======================================
1 of 108 tests failed
(7 tests were not run)
Please report to libvir-list at redhat.com
=======================================
make[2]: *** [check-TESTS] Error 1
make[2]: Leaving directory `/home/prerna/build/libvirt/tests'
make[1]: *** [check-am] Error 2
make[1]: Leaving directory `/home/prerna/build/libvirt/tests'
make: *** [check-recursive] Error 1
.....................................

This patch skips virnetdaemontest in absence of yajl-devel, so that
make check gracefully runs to completion.

Signed-off-by: Prerna Saxena <saxenap.ltc at gmail.com>
---
  tests/virnetdaemontest.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index 24cbd54..17d1f7f 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -290,6 +290,11 @@ mymain(void)
  {
      int ret = 0;

+#if !WITH_YAJL
+    fputs("libvirt not compiled with yajl, skipping this test\n", stderr);
+    return EXIT_AM_SKIP;
+#endif
+
      if (virInitialize() < 0 ||
          virEventRegisterDefaultImpl() < 0) {
          virDispatchError(NULL);
-- 
1.7.1




More information about the libvir-list mailing list