From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 11 May 2017 14:50:04 +0000 (+0200)
Subject: tests: storage: Fully register storage driver
X-Git-Tag: v3.6.0-rc1~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2117d42c7ca984e381fc362c46cf3275c4d0f7c6;p=thirdparty%2Flibvirt.git

tests: storage: Fully register storage driver

Use the full storage driver registration method that also fails if one
of the storage backends is not present. This makes the test fail if a
submodule fails registration, which is useful for testing.

Additionally return EXIT_FAILURE as usual in tests rather than -1.
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 90fcf36ca1..65f0fe7828 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -32,7 +32,6 @@
 #include "dirname.h"
 
 #include "storage/storage_driver.h"
-#include "storage/storage_backend.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
@@ -732,8 +731,8 @@ mymain(void)
     virStorageSourcePtr chain2; /* short for chain->backingStore */
     virStorageSourcePtr chain3; /* short for chain2->backingStore */
 
-    if (virStorageBackendDriversRegister(false) < 0)
-       return -1;
+    if (storageRegisterAll() < 0)
+       return EXIT_FAILURE;
 
     /* Prep some files with qemu-img; if that is not found on PATH, or
      * if it lacks support for qcow2 and qed, skip this test.  */