tests: Fix build issue with storagevolxml2xmltest

Commit 7a227688a caused a build failure on mingw. Following
other uses of including ../src/libvirt_driver_storage_impl.la
I moved to under the WITH_STORAGE conditional.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab4c71652901cc91d00277ba83cfb9d76bfbadd7..c034fe0bf317b608eac0bc41fbe8aab74885e04b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -368,6 +368,7 @@ if WITH_STORAGE
 test_programs += storagevolxml2argvtest
 test_programs += storagepoolxml2argvtest
 test_programs += virstorageutiltest
+test_programs += storagepoolxml2xmltest
 endif WITH_STORAGE
 
 if WITH_STORAGE_FS
@@ -384,7 +385,7 @@ test_programs += nsstest nssguesttest
 test_libraries += nssmock.la
 endif WITH_NSS
 
-test_programs += storagevolxml2xmltest storagepoolxml2xmltest
+test_programs += storagevolxml2xmltest
 
 test_programs += nodedevxml2xmltest
 
@@ -924,9 +925,17 @@ storagepoolxml2argvtest_LDADD = \
        ../src/libvirt_util.la \
        $(LDADDS)
 
+storagepoolxml2xmltest_SOURCES = \
+       storagepoolxml2xmltest.c \
+       testutils.c testutils.h
+storagepoolxml2xmltest_LDADD = $(LDADDS) \
+       ../src/libvirt_driver_storage_impl.la \
+       $(GNULIB_LIBS)
+
 else ! WITH_STORAGE
 EXTRA_DIST += storagevolxml2argvtest.c
 EXTRA_DIST += virstorageutiltest.c
+EXTRA_DIST += storagepoolxml2xmltest.c
 endif ! WITH_STORAGE
 
 storagevolxml2xmltest_SOURCES = \
@@ -934,13 +943,6 @@ storagevolxml2xmltest_SOURCES = \
        testutils.c testutils.h
 storagevolxml2xmltest_LDADD = $(LDADDS)
 
-storagepoolxml2xmltest_SOURCES = \
-       storagepoolxml2xmltest.c \
-       testutils.c testutils.h
-storagepoolxml2xmltest_LDADD = $(LDADDS) \
-       ../src/libvirt_driver_storage_impl.la \
-       $(GNULIB_LIBS)
-
 nodedevxml2xmltest_SOURCES = \
        nodedevxml2xmltest.c \
        testutils.c testutils.h