Re: [Emacs-diffs] emacs-25 f5c762c: Additional changes for "make check-expensive"

[phillip.lord@russet.org.uk (Phillip Lord)]

Michael Albinus <Michael.Albinus@gmx.de> writes:
> diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
> index 43e3905..48920ef 100644
> --- a/test/automated/Makefile.in
> +++ b/test/automated/Makefile.in
> @@ -87,9 +87,9 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
>  ## to change this; bug#17848 - if that gets done, this can be simplified).
>  ##
>  ## Beware: it approximates 'no-byte-compile', so watch out for false-positives!
> -SELECTOR_DEFAULT=(not (tag :expensive-test))
> +SELECTOR_DEFAULT=(quote (not (tag :expensive-test)))
>  SELECTOR_EXPENSIVE=nil
> -SELECTOR=${SELECTOR_DEFAULT}
> +SELECTOR=

Michael

I think that there is a problem with this commit, in that the default
selector is only used for "make check". By default "make check-maybe"
runs all tests (including the expensive ones). So, you have to do

make check-maybe SELECTOR="(quote (not (tag :expensive-test)))"

I think it makes more sense for check-maybe to skip expensive tests,
unless told otherwise, as "make check-maybe" is a good candidate for use
pre-commit.

Something like this should work:


SELECTOR_DEFAULT=(quote (not (tag :expensive-test)))
SELECTOR_EXPENSIVE=nil
SELECTOR=
ifeq ($(SELECTOR),undefined)
SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
else
SELECTOR_ACTUAL=$(SELECTOR)
endif

(and changing all subsequent uses of SELECTOR to SELECTOR_ACTUAL).


which would preserve the use of "SELECTOR" for use on the command line.

Make sense? (er, pun not intended).

Phil