From patchwork Tue Aug 26 04:30:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 382925 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 A86E41400D6 for ; Tue, 26 Aug 2014 14:30:47 +1000 (EST) Received: from localhost ([::1]:51583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XM8P7-0008A8-Qi for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 00:30:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XM8OW-0007Fz-4E for qemu-devel@nongnu.org; Tue, 26 Aug 2014 00:30:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XM8OI-0002l7-VQ for qemu-devel@nongnu.org; Tue, 26 Aug 2014 00:30:08 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:42078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XM8OI-0002kU-JS for qemu-devel@nongnu.org; Tue, 26 Aug 2014 00:29:54 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id CFA7A14011D; Tue, 26 Aug 2014 14:29:51 +1000 (EST) From: David Gibson To: agraf@suse.de Date: Tue, 26 Aug 2014 14:30:17 +1000 Message-Id: <1409027418-4453-3-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409027418-4453-1-git-send-email-david@gibson.dropbear.id.au> References: <1409027418-4453-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2401:3900:2:1::2 Cc: qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 2/3] target-ppc: Disable ppc Mac tests when !CONFIG_MAC 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 The testsuites contain several tests which require the "mac99" and "g3beige" machine types, which will fail when CONFIG_MAC is not specified. Signed-off-by: David Gibson --- tests/boot-order-test.c | 6 ++++++ tests/endianness-test.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index bff16b5..1a7aa8b 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -138,12 +138,14 @@ static void test_prep_boot_order(void) } #endif /* CONFIG_PREP */ +#ifdef CONFIG_MAC static uint64_t read_boot_order_pmac(void) { QFWCFG *fw_cfg = mm_fw_cfg_init(0xf0000510); return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } +#endif /* CONFIG_MAC */ static const boot_order_test test_cases_fw_cfg[] = { { "", 'c', 'c' }, @@ -153,6 +155,7 @@ static const boot_order_test test_cases_fw_cfg[] = { {} }; +#ifdef CONFIG_MAC static void test_pmac_oldworld_boot_order(void) { test_boot_orders("g3beige", read_boot_order_pmac, test_cases_fw_cfg); @@ -162,6 +165,7 @@ static void test_pmac_newworld_boot_order(void) { test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg); } +#endif /* CONFIG_MAC */ static uint64_t read_boot_order_sun4m(void) { @@ -199,10 +203,12 @@ int main(int argc, char *argv[]) #ifdef CONFIG_PREP qtest_add_func("boot-order/prep", test_prep_boot_order); #endif /* CONFIG_PREP */ +#ifdef CONFIG_MAC qtest_add_func("boot-order/pmac_oldworld", test_pmac_oldworld_boot_order); qtest_add_func("boot-order/pmac_newworld", test_pmac_newworld_boot_order); +#endif /* CONFIG_MAC */ } else if (strcmp(arch, "sparc") == 0) { qtest_add_func("boot-order/sun4m", test_sun4m_boot_order); } else if (strcmp(arch, "sparc64") == 0) { diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 0857784..73b512b 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -40,12 +40,16 @@ static const TestCase test_cases[] = { { "mips64", "mips", 0x14000000, .bswap = true }, { "mips64", "malta", 0x10000000, .bswap = true }, { "mips64el", "fulong2e", 0x1fd00000 }, +#ifdef CONFIG_MAC { "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" }, +#endif /* CONFIG_MAC */ #ifdef CONFIG_PREP { "ppc", "prep", 0x80000000, .bswap = true }, #endif /* CONFIG_PREP */ { "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" }, +#ifdef CONFIG_MAC { "ppc64", "mac99", 0xf2000000, .bswap = true, .superio = "i82378" }, +#endif /* CONFIG_MAC */ { "ppc64", "pseries", 0x10080000000ULL, .bswap = true, .superio = "i82378" }, { "sh4", "r2d", 0xfe240000, .superio = "i82378" },