From patchwork Mon May 5 18:01:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 29663 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 16C5A20CB3 for ; Mon, 5 May 2014 18:03:16 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fa1sf5423953pad.8 for ; Mon, 05 May 2014 11:03:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=txIAD+lZzxoPgRVLm1PpH97rYhqKBBZ0+aC8Oo+oajo=; b=GsxFowzMnlvz2Uo7hGhA3FEWsrjhgZjloKdiadwccnzfIZM5N4WpD19Jeps2nCBXpO XAD1DVxxM85C54ILmnPriPrJrquDMgR9t1SR7weKhTefiOEV+Ha48ZPaQ+FLjf+vt1vQ V/TCYaG239uGPftfey/kaAVJMrMm/C3+yaxAOmT5m8/so8Bdz8LlF9n5EDGAxNMODm/R KdwgjcSx1j2YHEZZ1PrEm/2QsSoiIwwuIACxHbsovLQe70DxvspD7+kGalLwcUZMqJJH vjTUfATI+EAbtAnpuXoHU2imVweAuKyHw5wITlR++QKF+w5qwLzxNv1mvldjea5Olx+V QS3g== X-Gm-Message-State: ALoCoQkG/OMbjhgjGi+qVB8EU+A1S6xDEya73VRM4FqaOjdg1hNcTB9vGBnrnNZPpyYn34yA950J X-Received: by 10.66.254.101 with SMTP id ah5mr17181860pad.8.1399312996143; Mon, 05 May 2014 11:03:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.179 with SMTP id s48ls582419qge.17.gmail; Mon, 05 May 2014 11:03:15 -0700 (PDT) X-Received: by 10.220.249.6 with SMTP id mi6mr1607177vcb.33.1399312995794; Mon, 05 May 2014 11:03:15 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id w19si1754133vcf.59.2014.05.05.11.03.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 11:03:15 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so1489903veb.16 for ; Mon, 05 May 2014 11:03:15 -0700 (PDT) X-Received: by 10.52.181.132 with SMTP id dw4mr952206vdc.86.1399312995709; Mon, 05 May 2014 11:03:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp160305vcb; Mon, 5 May 2014 11:03:08 -0700 (PDT) X-Received: by 10.140.50.230 with SMTP id s93mr43567855qga.33.1399312988699; Mon, 05 May 2014 11:03:08 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i1si3839584qab.228.2014.05.05.11.03.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 05 May 2014 11:03:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:58829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhNEK-0004gF-7m for patch@linaro.org; Mon, 05 May 2014 14:03:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhNDS-0003hG-6f for qemu-devel@nongnu.org; Mon, 05 May 2014 14:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhNDM-000168-MX for qemu-devel@nongnu.org; Mon, 05 May 2014 14:02:14 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:52255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhNDM-00015k-F1; Mon, 05 May 2014 14:02:08 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 744AC40751; Mon, 5 May 2014 22:02:06 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 55E4F66D; Mon, 5 May 2014 22:02:06 +0400 (MSK) Received: (nullmailer pid 24216 invoked by uid 1000); Mon, 05 May 2014 18:02:05 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 5 May 2014 22:01:45 +0400 Message-Id: <1399312923-24129-5-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399312923-24129-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1399312923-24129-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Peter Maydell , Michael Tokarev Subject: [Qemu-devel] [PULL 04/22] tests/tcg: Fix compilation of test_path 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mjt@tls.msk.ru X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell The test_path binary is (unlike the other test binaries in tests/tcg) actually intended to be compiled with the same compiler used to build the main QEMU executables. It actually #includes a number of the QEMU source files in an attempt to unit-test the util/path.c functions, and so if it is not compiled with the same compiler used by configure to set CONFIG_ settings then it is liable to fail to build. Fix the makefile to build it with the default C compiler rules, not CC_I386, and fix the test itself not to include a lot of unnecessary trace related source files which cause the build to fail if the trace backend is anything other than 'simple'. Signed-off-by: Peter Maydell Signed-off-by: Michael Tokarev --- tests/tcg/Makefile | 2 -- tests/tcg/test_path.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 24e3154..89e3342 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -81,10 +81,8 @@ run-test_path: test_path # rules to compile tests test_path: test_path.o - $(CC_I386) $(LDFLAGS) -o $@ $^ $(LIBS) test_path.o: test_path.c - $(CC_I386) $(QEMU_INCLUDES) $(GLIB_CFLAGS) $(CFLAGS) -c -o $@ $^ hello-i386: hello-i386.c $(CC_I386) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $< diff --git a/tests/tcg/test_path.c b/tests/tcg/test_path.c index f8dd36a..1c29bce 100644 --- a/tests/tcg/test_path.c +++ b/tests/tcg/test_path.c @@ -1,17 +1,10 @@ /* Test path override code */ -#define _GNU_SOURCE #include "config-host.h" #include "util/cutils.c" #include "util/hexdump.c" #include "util/iov.c" #include "util/path.c" #include "util/qemu-timer-common.c" -#include "trace/control.c" -#include "../trace/generated-events.c" -#ifdef CONFIG_TRACE_SIMPLE -#include "trace/simple.c" -#endif - #include #include #include