diff mbox series

[v1,v1,1/1] tests: machine-none-test: Enable MicroBlaze testing

Message ID 20200416193303.23674-2-edgar.iglesias@gmail.com
State New
Headers show
Series tests: machine-none-test: Enable MicroBlaze testing | expand

Commit Message

Edgar E. Iglesias April 16, 2020, 7:33 p.m. UTC 
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>

Enable MicroBlaze testing.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
 tests/qtest/machine-none-test.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Paolo Bonzini April 25, 2020, 10:56 a.m. UTC | #1 
On 16/04/20 21:33, Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
> 
> Enable MicroBlaze testing.
> 
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
>  tests/qtest/machine-none-test.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
> index 8bb54a6360..209d86eb57 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -33,8 +33,8 @@ static struct arch2cpu cpus_map[] = {
>      { "cris", "crisv32" },
>      { "lm32", "lm32-full" },
>      { "m68k", "m5206" },
> -    /* FIXME: { "microblaze", "any" }, doesn't work with -M none -cpu any */
> -    /* FIXME: { "microblazeel", "any" }, doesn't work with -M none -cpu any */
> +    { "microblaze", "any" },
> +    { "microblazeel", "any" },
>      { "mips", "4Kc" },
>      { "mipsel", "I7200" },
>      { "mips64", "20Kc" },
> @@ -79,10 +79,8 @@ static void test_machine_cpu_cli(void)
>      QTestState *qts;
>  
>      if (!cpu_model) {
> -        if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) {
> -            fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined,"
> -                    " add it to cpus_map\n", arch);
> -        }
> +        fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined,"
> +                " add it to cpus_map\n", arch);
>          return; /* TODO: die here to force all targets have a test */
>      }
>      qts = qtest_initf("-machine none -cpu '%s'", cpu_model);
> 

Queued, thanks.

Paolo
diff mbox series

Patch

diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index 8bb54a6360..209d86eb57 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -33,8 +33,8 @@  static struct arch2cpu cpus_map[] = {
     { "cris", "crisv32" },
     { "lm32", "lm32-full" },
     { "m68k", "m5206" },
-    /* FIXME: { "microblaze", "any" }, doesn't work with -M none -cpu any */
-    /* FIXME: { "microblazeel", "any" }, doesn't work with -M none -cpu any */
+    { "microblaze", "any" },
+    { "microblazeel", "any" },
     { "mips", "4Kc" },
     { "mipsel", "I7200" },
     { "mips64", "20Kc" },
@@ -79,10 +79,8 @@  static void test_machine_cpu_cli(void)
     QTestState *qts;
 
     if (!cpu_model) {
-        if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) {
-            fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined,"
-                    " add it to cpus_map\n", arch);
-        }
+        fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined,"
+                " add it to cpus_map\n", arch);
         return; /* TODO: die here to force all targets have a test */
     }
     qts = qtest_initf("-machine none -cpu '%s'", cpu_model);