Thorough tests may have more dependencies than faster ones.
Dependencies are now looked up based on the suites being
executed, not on the suites passed as goals to the makefile.
Therefore, it is possible to limit dependencies to the
speeds that need them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/mtest2make.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index 891037e1d66..692e4867ec7 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -59,13 +59,13 @@ def process_tests(test, targets, suites):
             s = s.split(':')[1]
             if s == 'slow' or s == 'thorough':
                 continue
+        suites[s].deps.update(deps)
         if s.endswith('-slow'):
             s = s[:-5]
             suites[s].speeds.append('slow')
         if s.endswith('-thorough'):
             s = s[:-9]
             suites[s].speeds.append('thorough')
-        suites[s].deps.update(deps)
 
 def emit_prolog(suites, prefix):
     all_targets = ' '.join((f'{prefix}-{k}' for k in suites.keys()))
-- 
2.51.1

Paolo Bonzini <pbonzini@redhat.com> writes:

> Thorough tests may have more dependencies than faster ones.
> Dependencies are now looked up based on the suites being
> executed, not on the suites passed as goals to the makefile.
> Therefore, it is possible to limit dependencies to the
> speeds that need them.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  scripts/mtest2make.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
> index 891037e1d66..692e4867ec7 100644
> --- a/scripts/mtest2make.py
> +++ b/scripts/mtest2make.py
> @@ -59,13 +59,13 @@ def process_tests(test, targets, suites):
>              s = s.split(':')[1]
>              if s == 'slow' or s == 'thorough':
>                  continue
> +        suites[s].deps.update(deps)
>          if s.endswith('-slow'):
>              s = s[:-5]
>              suites[s].speeds.append('slow')
>          if s.endswith('-thorough'):
>              s = s[:-9]
>              suites[s].speeds.append('thorough')
> -        suites[s].deps.update(deps)
>  
>  def emit_prolog(suites, prefix):
>      all_targets = ' '.join((f'{prefix}-{k}' for k in suites.keys()))

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro