[Qemu-devel] [PATCH 1/3] target-ppc: Disable PReP testcases with !CONFIG_PREP

[David Gibson]

The test suites contain several tests which require the "prep" machine
type, which will fail if that is configured out.

Signed-off-by: David Gibson <address@hidden>
---
 tests/boot-order-test.c | 4 ++++
 tests/endianness-test.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index 360a691..bff16b5 100644
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -112,6 +112,7 @@ static void test_pc_boot_order(void)
     test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
 }
 
+#ifdef CONFIG_PREP
 static uint8_t read_m48t59(uint64_t addr, uint16_t reg)
 {
     writeb(addr, reg & 0xff);
@@ -135,6 +136,7 @@ static void test_prep_boot_order(void)
 {
     test_boot_orders("prep", read_boot_order_prep, test_cases_prep);
 }
+#endif /* CONFIG_PREP */
 
 static uint64_t read_boot_order_pmac(void)
 {
@@ -194,7 +196,9 @@ int main(int argc, char *argv[])
     if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
         qtest_add_func("boot-order/pc", test_pc_boot_order);
     } else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) {
+#ifdef CONFIG_PREP
         qtest_add_func("boot-order/prep", test_prep_boot_order);
+#endif /* CONFIG_PREP */
         qtest_add_func("boot-order/pmac_oldworld",
                        test_pmac_oldworld_boot_order);
         qtest_add_func("boot-order/pmac_newworld",
diff --git a/tests/endianness-test.c b/tests/endianness-test.c
index 92e17d2..0857784 100644
--- a/tests/endianness-test.c
+++ b/tests/endianness-test.c
@@ -41,7 +41,9 @@ static const TestCase test_cases[] = {
     { "mips64", "malta", 0x10000000, .bswap = true },
     { "mips64el", "fulong2e", 0x1fd00000 },
     { "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
+#ifdef CONFIG_PREP
     { "ppc", "prep", 0x80000000, .bswap = true },
+#endif /* CONFIG_PREP */
     { "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
     { "ppc64", "mac99", 0xf2000000, .bswap = true, .superio = "i82378" },
     { "ppc64", "pseries", 0x10080000000ULL,
-- 
1.9.3