From patchwork Mon Apr 25 14:40:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 614513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3qtpmQ1J6Zz9s1h; Tue, 26 Apr 2016 00:40:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1auhgR-0007Z2-Gg; Mon, 25 Apr 2016 14:40:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1auhgL-0007Yl-LI for fwts-devel@lists.ubuntu.com; Mon, 25 Apr 2016 14:40:13 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1auhgL-0002Ro-80; Mon, 25 Apr 2016 14:40:13 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: einj, msct: only build in these tests on ACPI enabled systems Date: Mon, 25 Apr 2016 15:40:12 +0100 Message-Id: <1461595212-3267-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King These tests fail to build on non-ACPI targets, so make sure they only build if FWTS_HAS_ACPI is defined. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/einj/einj.c | 5 +++++ src/acpi/msct/msct.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c index 4efd71a..3eae36a 100644 --- a/src/acpi/einj/einj.c +++ b/src/acpi/einj/einj.c @@ -13,6 +13,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "fwts_acpi_object_eval.h" #include @@ -165,3 +168,5 @@ static fwts_framework_ops einj_ops = { FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif diff --git a/src/acpi/msct/msct.c b/src/acpi/msct/msct.c index 9432cf6..88c29d3 100644 --- a/src/acpi/msct/msct.c +++ b/src/acpi/msct/msct.c @@ -13,6 +13,9 @@ * */ #include "fwts.h" + +#if defined(FWTS_HAS_ACPI) + #include "fwts_acpi_object_eval.h" #include @@ -130,3 +133,5 @@ static fwts_framework_ops msct_ops = { FWTS_REGISTER("msct", &msct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + +#endif