diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-14 18:06:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-14 18:06:44 +0100 |
| commit | 6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97 (patch) | |
| tree | 0dcdd090696a104284db8bcc28acc94410383eec /tests/Makefile | |
| parent | 074a9925e1cfd659d5376dcaccd1436d3840e611 (diff) | |
| parent | 8887f84c54f6e74124544d1700a205e5b6821b3d (diff) | |
| download | qemu-6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97.zip qemu-6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97.tar.gz qemu-6b324b3e5906fd9a9ce7f4f24decd1f1c7afde97.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 14 Aug 2015 16:01:19 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/net-pull-request:
tests: test rx recovery from cont
tests: introduce basic pci test for virtio-net
net/vmxnet3: Fix incorrect debug message
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 7494582..5271123 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -381,7 +381,7 @@ tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y) tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y) -tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) +tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) $(libqos-virtio-obj-y) tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y) tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y) tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o |