From patchwork Thu Mar 12 16:07:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 5997071 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C06C49F380 for ; Thu, 12 Mar 2015 16:07:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1CCD200F4 for ; Thu, 12 Mar 2015 16:07:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DF296200B4 for ; Thu, 12 Mar 2015 16:07:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 596B66E9E6; Thu, 12 Mar 2015 09:07:13 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 96F386E9E6 for ; Thu, 12 Mar 2015 09:07:11 -0700 (PDT) Received: by wggx12 with SMTP id x12so17361044wgg.10 for ; Thu, 12 Mar 2015 09:07:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Pway6pZlLWVyKujNXtpSv9gOh9fZ+g7E4esnnlFVbCg=; b=amiMWCGTmMHaPHz0kzWXwnx2XH1z0dYrhlgBUmFJfRs2PUROuRlzgu+Sq+vPK8yrLT ZkhFOgjyWWaskBEO++HdRKnkJvuUDneeeXU/sNjE5kQKrlJVvkijYUFPzSUTSWI1SMyc WzUbjs7GboW0wk/m5rrUT1rtx3LyJbPw7GB3jQoWWsa8INQc/ZV8ZGQiRO682NU6EvZw wWW4dY0Gg3qCczLIBJgKg6sKQXIhe6P/ZRg5pB2T2YvRmGfiEQBx+Q3LU+GeheLs8hNt oyliRBz7rOlPMu3vLyDlIZTsz8kZj2pA6g/UOZ1G8EudoPj5Gx4fLcLECwPh0QKO25td fZCA== X-Gm-Message-State: ALoCoQnYuNqnkBI+Tnr6fV0S3BjUH0CB6r/KGnxW9mLWn+Qs+WF+zOBDY8QSfKCjeB2TzxM7nRNM X-Received: by 10.194.92.169 with SMTP id cn9mr10095095wjb.61.1426176430521; Thu, 12 Mar 2015 09:07:10 -0700 (PDT) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id gj16sm11329240wic.24.2015.03.12.09.07.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Mar 2015 09:07:09 -0700 (PDT) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Mar 2015 16:07:06 +0000 Message-Id: <1426176426-7365-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <20150312135913.GA27995@strange.ger.corp.intel.com> References: <20150312135913.GA27995@strange.ger.corp.intel.com> Subject: [Intel-gfx] [PATCH i-g-t] lib: move igt_interactive_debug into igt_core.c X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP igt_interactive_debug should be defined in igt_core.c, rather than the header, to avoid it being defined more than once. Reported-by: Damien Lespiau Signed-off-by: Thomas Wood --- lib/igt_core.c | 1 + lib/igt_core.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/igt_core.c b/lib/igt_core.c index c217a01..4ae3524 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -209,6 +209,7 @@ */ static unsigned int exit_handler_count; +const char *igt_interactive_debug; /* subtests helpers */ static bool list_subtests = false; diff --git a/lib/igt_core.h b/lib/igt_core.h index c2c820d..0716000 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -557,7 +557,7 @@ bool igt_run_in_simulation(void); void igt_skip_on_simulation(void); -const char *igt_interactive_debug; +extern const char *igt_interactive_debug; /* structured logging */ enum igt_log_level {