External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix build issue with storagevolxml2xmltest

Browse Source 
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>
This commit is contained in:
John Ferlan 2019-01-30 09:29:37 -05:00
parent ab6ca81276
commit 406473990c
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/Makefile.am
View File

@ -368,6 +368,7 @@ if WITH_STORAGE
test_programs += storagevolxml2argvtest test_programs += storagevolxml2argvtest
test_programs += storagepoolxml2argvtest test_programs += storagepoolxml2argvtest
test_programs += virstorageutiltest test_programs += virstorageutiltest
test_programs += storagepoolxml2xmltest
endif WITH_STORAGE endif WITH_STORAGE
if WITH_STORAGE_FS if WITH_STORAGE_FS
@ -384,7 +385,7 @@ test_programs += nsstest nssguesttest
test_libraries += nssmock.la test_libraries += nssmock.la
endif WITH_NSS endif WITH_NSS
test_programs += storagevolxml2xmltest storagepoolxml2xmltest test_programs += storagevolxml2xmltest
test_programs += nodedevxml2xmltest test_programs += nodedevxml2xmltest
@ -924,16 +925,6 @@ storagepoolxml2argvtest_LDADD = \
../src/libvirt_util.la \ ../src/libvirt_util.la \
$(LDADDS) $(LDADDS)
else ! WITH_STORAGE
EXTRA_DIST += storagevolxml2argvtest.c
EXTRA_DIST += virstorageutiltest.c
endif ! WITH_STORAGE
storagevolxml2xmltest_SOURCES = \
storagevolxml2xmltest.c \
testutils.c testutils.h
storagevolxml2xmltest_LDADD = $(LDADDS)
storagepoolxml2xmltest_SOURCES = \ storagepoolxml2xmltest_SOURCES = \
storagepoolxml2xmltest.c \ storagepoolxml2xmltest.c \
testutils.c testutils.h testutils.c testutils.h
@ -941,6 +932,17 @@ storagepoolxml2xmltest_LDADD = $(LDADDS) \
../src/libvirt_driver_storage_impl.la \ ../src/libvirt_driver_storage_impl.la \
$(GNULIB_LIBS) $(GNULIB_LIBS)
else ! WITH_STORAGE
EXTRA_DIST += storagevolxml2argvtest.c
EXTRA_DIST += virstorageutiltest.c
EXTRA_DIST += storagepoolxml2xmltest.c
endif ! WITH_STORAGE
storagevolxml2xmltest_SOURCES = \
storagevolxml2xmltest.c \
testutils.c testutils.h
storagevolxml2xmltest_LDADD = $(LDADDS)
nodedevxml2xmltest_SOURCES = \ nodedevxml2xmltest_SOURCES = \
nodedevxml2xmltest.c \ nodedevxml2xmltest.c \
testutils.c testutils.h testutils.c testutils.h