From: Thomas Huth <thuth@redhat.com>

The "petalogix-ml605" boot-serial-test can be run with the
"microblaze" target. The remaining tests can simply be dropped
now that we are going to remove the "microblazeel" target.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/boot-serial-test.c  | 2 +-
 tests/qtest/machine-none-test.c | 1 -
 tests/qtest/meson.build         | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index a05d26ee996..bcd0a9c50e7 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -186,7 +186,7 @@ static const testdef_t tests[] = {
     { "m68k", "next-cube", "", "TT", sizeof(bios_nextcube), 0, bios_nextcube },
     { "microblaze", "petalogix-s3adsp1800", "", "TT",
       sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 },
-    { "microblazeel", "petalogix-ml605", "", "TT",
+    { "microblaze", "petalogix-ml605", "", "TT",
       sizeof(kernel_plml605), kernel_plml605 },
     { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
     { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index b6a87d27edb..c1e22dcecc7 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -32,7 +32,6 @@ static struct arch2cpu cpus_map[] = {
     { "alpha", "ev67" },
     { "m68k", "m5206" },
     { "microblaze", "any" },
-    { "microblazeel", "any" },
     { "mips", "4Kc" },
     { "mipsel", "I7200" },
     { "mips64", "20Kc" },
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 25fdbc79801..ba9f59d2f8f 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -159,8 +159,6 @@ qtests_m68k = ['boot-serial-test'] + \
 qtests_microblaze = ['boot-serial-test'] + \
   qtests_filter
 
-qtests_microblazeel = qtests_microblaze
-
 qtests_mips = \
   qtests_filter + \
   (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \
-- 
2.53.0

Thomas Huth <thuth@redhat.com> writes:

> From: Thomas Huth <thuth@redhat.com>
>
> The "petalogix-ml605" boot-serial-test can be run with the
> "microblaze" target. The remaining tests can simply be dropped
> now that we are going to remove the "microblazeel" target.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qtest/boot-serial-test.c  | 2 +-
>  tests/qtest/machine-none-test.c | 1 -
>  tests/qtest/meson.build         | 2 --
>  3 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
> index a05d26ee996..bcd0a9c50e7 100644
> --- a/tests/qtest/boot-serial-test.c
> +++ b/tests/qtest/boot-serial-test.c
> @@ -186,7 +186,7 @@ static const testdef_t tests[] = {
>      { "m68k", "next-cube", "", "TT", sizeof(bios_nextcube), 0, bios_nextcube },
>      { "microblaze", "petalogix-s3adsp1800", "", "TT",
>        sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 },
> -    { "microblazeel", "petalogix-ml605", "", "TT",
> +    { "microblaze", "petalogix-ml605", "", "TT",
>        sizeof(kernel_plml605), kernel_plml605 },
>      { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
>      { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
> diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
> index b6a87d27edb..c1e22dcecc7 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -32,7 +32,6 @@ static struct arch2cpu cpus_map[] = {
>      { "alpha", "ev67" },
>      { "m68k", "m5206" },
>      { "microblaze", "any" },
> -    { "microblazeel", "any" },
>      { "mips", "4Kc" },
>      { "mipsel", "I7200" },
>      { "mips64", "20Kc" },
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 25fdbc79801..ba9f59d2f8f 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -159,8 +159,6 @@ qtests_m68k = ['boot-serial-test'] + \
>  qtests_microblaze = ['boot-serial-test'] + \
>    qtests_filter
>  
> -qtests_microblazeel = qtests_microblaze
> -
>  qtests_mips = \
>    qtests_filter + \
>    (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) +            \

Reviewed-by: Fabiano Rosas <farosas@suse.de>