On Fri, Apr 19, 2024 at 10:13:18AM +0200, Jan Richter wrote:
> The test_migrate_unmapped_collection test fails when the errata
> requirements are not met and the test should be skipped. Instead of
> being skipped, the test returns `ERROR: Test exit before migration
> point.`
>
> This is caused by changes in commit fa8914bccc22 ("migration: Add a
> migrate_skip command") which changes the behaviour of skipped migration
> tests. This fixes this issue by adding migrate_skip() method to
> test_migrate_unmapped_collection.
>
> Fixes: fa8914bccc22 ("migration: Add a migrate_skip command")
> Signed-off-by: Jan Richter <jarichte@xxxxxxxxxx>
> ---
> Changes from v1->v2:
> 1. typo fix meet/met
> 2. commit reference changed
> 3. Fixes tag added
>
> arm/gic.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arm/gic.c b/arm/gic.c
> index bbf828f1..256dd80d 100644
> --- a/arm/gic.c
> +++ b/arm/gic.c
> @@ -829,6 +829,7 @@ static void test_migrate_unmapped_collection(void)
> if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) {
> report_skip("Skipping test, as this test hangs without the fix. "
> "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS);
> + migrate_skip();
> return;
> }
>
> --
> 2.44.0
>
Merged.
Thanks,
drew
