[PATCH] tests: Fix broken "make check-speed"

[PATCH] tests: Fix broken "make check-speed"

[Thomas Huth]

When running "make check-speed", currently nothing happens. This is
because the redirection to "bench-speed" is not working as expected
(since the bench-speed rule in the generated Makefile.mtest filters
for "bench-speed" and "bench" in the MAKECMDGOALS variable).
Fix it by calling "make bench-speed" instead of using a dependency.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index d34254fb29..2a43cce4f6 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -134,7 +134,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
 
 # Consolidated targets
 
-.PHONY: check-block check check-clean get-vm-images
+.PHONY: check-block check check-clean get-vm-images check-speed
 check:
 
 ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy)
@@ -156,6 +156,7 @@ clean: check-clean
 
 # For backwards compatibility
 
-check-speed: bench-speed
+check-speed:
+	$(MAKE) bench-speed
 
 endif
-- 
2.27.0

Re: [PATCH] tests: Fix broken "make check-speed"

[Willian Rampazzo]

On Wed, Mar 10, 2021 at 6:51 AM Thomas Huth <thuth@redhat.com> wrote:
>
> When running "make check-speed", currently nothing happens. This is
> because the redirection to "bench-speed" is not working as expected
> (since the bench-speed rule in the generated Makefile.mtest filters
> for "bench-speed" and "bench" in the MAKECMDGOALS variable).
> Fix it by calling "make bench-speed" instead of using a dependency.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/Makefile.include | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Tested-by: Willian Rampazzo <willianr@redhat.com>

Re: [PATCH] tests: Fix broken "make check-speed"

[Paolo Bonzini]

On 10/03/21 16:49, Willian Rampazzo wrote:
> On Wed, Mar 10, 2021 at 6:51 AM Thomas Huth <thuth@redhat.com> wrote:
>>
>> When running "make check-speed", currently nothing happens. This is
>> because the redirection to "bench-speed" is not working as expected
>> (since the bench-speed rule in the generated Makefile.mtest filters
>> for "bench-speed" and "bench" in the MAKECMDGOALS variable).
>> Fix it by calling "make bench-speed" instead of using a dependency.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   tests/Makefile.include | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
> 
> Reviewed-by: Willian Rampazzo <willianr@redhat.com>
> Tested-by: Willian Rampazzo <willianr@redhat.com>
> 

I don't object to the patch, but if no one has noticed in 6 months 
perhaps the target can go (replaced by "make bench"/"make bench-speed").

Paolo

Re: [PATCH] tests: Fix broken "make check-speed"

[Willian Rampazzo]

On Wed, Mar 10, 2021 at 1:04 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 10/03/21 16:49, Willian Rampazzo wrote:
> > On Wed, Mar 10, 2021 at 6:51 AM Thomas Huth <thuth@redhat.com> wrote:
> >>
> >> When running "make check-speed", currently nothing happens. This is
> >> because the redirection to "bench-speed" is not working as expected
> >> (since the bench-speed rule in the generated Makefile.mtest filters
> >> for "bench-speed" and "bench" in the MAKECMDGOALS variable).
> >> Fix it by calling "make bench-speed" instead of using a dependency.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>   tests/Makefile.include | 5 +++--
> >>   1 file changed, 3 insertions(+), 2 deletions(-)
> >>
> >
> > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
> > Tested-by: Willian Rampazzo <willianr@redhat.com>
> >
>
> I don't object to the patch, but if no one has noticed in 6 months
> perhaps the target can go (replaced by "make bench"/"make bench-speed").
>

I was also thinking about it. If the target was not working and no one
complained, maybe remove it is just fine, so, +1 here for
removing/renaming.

> Paolo
>

Re: [PATCH] tests: Fix broken "make check-speed"

[Thomas Huth]

On 10/03/2021 17.08, Willian Rampazzo wrote:
> On Wed, Mar 10, 2021 at 1:04 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> On 10/03/21 16:49, Willian Rampazzo wrote:
>>> On Wed, Mar 10, 2021 at 6:51 AM Thomas Huth <thuth@redhat.com> wrote:
>>>>
>>>> When running "make check-speed", currently nothing happens. This is
>>>> because the redirection to "bench-speed" is not working as expected
>>>> (since the bench-speed rule in the generated Makefile.mtest filters
>>>> for "bench-speed" and "bench" in the MAKECMDGOALS variable).
>>>> Fix it by calling "make bench-speed" instead of using a dependency.
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>>    tests/Makefile.include | 5 +++--
>>>>    1 file changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>
>>> Reviewed-by: Willian Rampazzo <willianr@redhat.com>
>>> Tested-by: Willian Rampazzo <willianr@redhat.com>
>>>
>>
>> I don't object to the patch, but if no one has noticed in 6 months
>> perhaps the target can go (replaced by "make bench"/"make bench-speed").
>>
> 
> I was also thinking about it. If the target was not working and no one
> complained, maybe remove it is just fine, so, +1 here for
> removing/renaming.

Fine for me, too, but we then also have to update the output of "make 
check-help" accordingly. Care to send a patch?

  Thomas