tests: virstoragetest: fix --without-yajl

[libvirt] [PATCH] tests: virstoragetest: fix --without-yajl

Cole Robinson posted 1 patch 6 years, 10 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/e1225c8d98334850fc787340615f7df1bb797e4b.1498050172.git.crobinso@redhat.com

tests/virstoragetest.c | 3 +++
1 file changed, 3 insertions(+)

Expand all Fold all

[libvirt] [PATCH] tests: virstoragetest: fix --without-yajl

Posted by Cole Robinson 6 years, 10 months ago

Recently added JSON tests should be skipped if compiled --without-yajl

https://bugzilla.redhat.com/show_bug.cgi?id=1463435
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/virstoragetest.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 6c1287380..f34408395 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1359,6 +1359,8 @@ mymain(void)
                        "<source protocol='nbd' name='blah'>\n"
                        "  <host name='example.org' port='6000'/>\n"
                        "</source>\n");
+
+#ifdef WITH_YAJL
     TEST_BACKING_PARSE("json:", NULL);
     TEST_BACKING_PARSE("json:asdgsdfg", NULL);
     TEST_BACKING_PARSE("json:{}", NULL);
@@ -1573,6 +1575,7 @@ mymain(void)
                        "<source protocol='sheepdog' name='test'>\n"
                        "  <host name='example.com' port='321'/>\n"
                        "</source>\n");
+#endif /* WITH_YAJL */
 
  cleanup:
     /* Final cleanup */
-- 
2.13.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] tests: virstoragetest: fix --without-yajl

Posted by Erik Skultety 6 years, 10 months ago

On Wed, Jun 21, 2017 at 09:03:06AM -0400, Cole Robinson wrote:
> Recently added JSON tests should be skipped if compiled --without-yajl
>
> https://bugzilla.redhat.com/show_bug.cgi?id=1463435
> Signed-off-by: Cole Robinson <crobinso@redhat.com>

ACK

Erik

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list