Re: [PATCH 2/2] tests/Makefile: add TESTFILES option to make check-acceptance

[Philippe Mathieu-Daudé]

On 9/23/21 11:42, Daniel P. Berrangé wrote:
> On Thu, Sep 23, 2021 at 11:34:18AM +0200, Philippe Mathieu-Daudé wrote:
> > On 9/22/21 21:46, Willian Rampazzo wrote:
> > > On Wed, Sep 22, 2021 at 4:08 PM Philippe Mathieu-Daudé
> > > <philmd@redhat.com> wrote:
> > > > On 9/22/21 21:03, Willian Rampazzo wrote:
> > > > > Add the possibility of running all the tests from a single file, or
> > > > > multiple files, running a single test within a file or multiple tests
> > > > > within multiple files using `make check-acceptance` and the TESTFILES
> > > > > environment variable.
> > > > >
> > > > > Signed-off-by: Willian Rampazzo <willianr@redhat.com>
> > > > > ---
> > > > >     docs/devel/testing.rst | 27 +++++++++++++++++++++++++++
> > > > >     tests/Makefile.include |  5 ++++-
> > > > >     2 files changed, 31 insertions(+), 1 deletion(-)
> > > >
> > > > > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > > > > index 6e16c05f10..82d7ef7a20 100644
> > > > > --- a/tests/Makefile.include
> > > > > +++ b/tests/Makefile.include
> > > > > @@ -88,6 +88,9 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
> > > > >     TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
> > > > >     TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
> > > > >     TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
> > > > > +ifndef TESTFILES
> > > > > +     TESTFILES=tests/acceptance
> > > > > +endif
> > > > >     # Controls the output generated by Avocado when running tests.
> > > > >     # Any number of command separated loggers are accepted.  For more
> > > > >     # information please refer to "avocado --help".
> > > > > @@ -130,7 +133,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) 
> > > > > get-vm-images
> > > > >                 --show=$(AVOCADO_SHOW) run 
> > > > > --job-results-dir=$(TESTS_RESULTS_DIR) \
> > > > >                 --filter-by-tags-include-empty 
> > > > > --filter-by-tags-include-empty-key \
> > > > >                 $(AVOCADO_TAGS) \
> > > > > -            $(if $(GITLAB_CI),,--failfast) tests/acceptance, \
> > > > > +            $(if $(GITLAB_CI),,--failfast) $(TESTFILES), \
> > > >
> > > > Since this is Avocado specific, maybe call the variable
> > > > AVOCADO_TESTFILES (similar to AVOCADO_TAGS)?
> > >
> > > I don't see a problem with changing that to AVOCADO_TESTFILES. I was
> > > trying to make things shorter and easy to remember. If the too-long
> > > variable name is not a problem, I can change that.
> >
> > This is the generic tests/Makefile, so $TESTFILES might be confusing,
> > which is why I prefer the explicit AVOCADO_ prefix (AVOCADO_SHOW,
> > AVOCADO_TAGS).
>
> IIUC, this is not actually just test files - it is test files plus the
> test names. So better just  $(AVOCADO_TESTS)

Good point, I agree.