On Thu, Jun 19, 2014 at 06:09:05PM +0300, Nikolay Nikolaev wrote: > Also use qtest-obj-y to get the right library order. > > Signed-off-by: Nikolay Nikolaev <n.nikol...@virtualopensystems.com>
Seems to still break mingw build. Please build-test it. > --- > tests/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/Makefile b/tests/Makefile > index 4caf7de..db4accf 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -156,7 +156,7 @@ gcov-files-i386-y += hw/usb/hcd-ehci.c > gcov-files-i386-y += hw/usb/hcd-uhci.c > gcov-files-i386-y += hw/usb/dev-hid.c > gcov-files-i386-y += hw/usb/dev-storage.c > -#check-qtest-i386-y += tests/vhost-user-test$(EXESUF) > +check-qtest-i386-y += tests/vhost-user-test$(EXESUF) > check-qtest-x86_64-y = $(check-qtest-i386-y) > gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c > gcov-files-x86_64-y = $(subst > i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) > @@ -323,11 +323,11 @@ tests/es1370-test$(EXESUF): tests/es1370-test.o > tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o > tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o > tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o > $(libqos-pc-obj-y) > -tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o > qemu-timer.o libqemuutil.a libqemustub.a > +tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o > qemu-timer.o $(qtest-obj-y) > tests/qemu-iotests/socket_scm_helper$(EXESUF): > tests/qemu-iotests/socket_scm_helper.o > tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a > libqemustub.a > > -#LIBS+= -lutil > +LIBS+= -lutil > > # QTest rules >