From patchwork Thu Jun 19 17:35:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 361934 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E2DDF1400B0 for ; Fri, 20 Jun 2014 03:36:24 +1000 (EST) Received: from localhost ([::1]:36933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgG6-0008WU-Nv for incoming@patchwork.ozlabs.org; Thu, 19 Jun 2014 13:36:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgFg-00084r-S6 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxgFa-0004Sf-LJ for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:35:56 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:55861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxgFa-0004SN-GJ for qemu-devel@nongnu.org; Thu, 19 Jun 2014 13:35:50 -0400 Received: by mail-wg0-f46.google.com with SMTP id y10so2579201wgg.17 for ; Thu, 19 Jun 2014 10:35:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=PKnrjaOfbssOhwTh1zz1UqrfnSwAyDMR8oUTgi6Bj8Q=; b=LKCx9GPhxcAj9XujNptXiyt8hEHpNKbkMWq3hnyJcwbZOc6384cGCk5pbTN29Sa39Z XTkVzyLImAZMdtU4f+jdUsMTrKJJ2MFIYjGgUUsVffCMygdSaXhea/XN7CyxlvL1wcu0 PbMWqf1ljriGI0G3un1MaJMoZDhe6XzlmCcRpyxC3V0GuvoSQl2Z25r0HE+Kb3bHGdTN yOUUoSmkqp06m2MPAGsqObXrLJRVAEZ8MgnSZa+y58vscQOT4vBatGibmgl9rfjpCZqc x8UyzlfIzbO7X9O6RKGYqlITycOESHLdzSlQyCzG0ZeOqhJn8e2YzZHeRFAngfsbY91e gzkw== X-Gm-Message-State: ALoCoQmkqcqe7ELG8r0A4HXxN0N1QLugBRYdDriCDrBll9Eh8Nm5pGWjwG1lykVptWltnllLiZKM X-Received: by 10.180.75.236 with SMTP id f12mr8464149wiw.11.1403199349656; Thu, 19 Jun 2014 10:35:49 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id ey16sm35168883wid.14.2014.06.19.10.35.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 10:35:48 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Thu, 19 Jun 2014 20:35:42 +0300 Message-ID: <20140619173410.7378.82319.stgit@3820> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.46 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH v2] qtest: enable vhost-user-test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use qtest-obj-y to get the right library order. CONFIG_POSIX ensures mingw compilation won't break. Signed-off-by: Nikolay Nikolaev --- 0 files changed diff --git a/tests/Makefile b/tests/Makefile index 4caf7de..5661d52 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-$(CONFIG_POSIX) += 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,14 @@ 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 + +ifeq ($(CONFIG_POSIX),y) +LIBS+= -lutil +endif # QTest rules