On 22.08.2018 20:09, Luca Boccassi wrote:
> Some generated test files were not removed, including one executable in
> the testsuite/tools directory.
> Ensure make clean from the top level directory works for the testsuite
> subdirs too, and that all the files are removed.
> 
> Signed-off-by: Luca Boccassi <bl...@debian.org>
> ---

Patch 1+2 look good to me and I would ack if that would count in any way.
For patch 3 I only wonder whether that might re-use $PREFIX (which is
defined as "sudo -E unshare -n"). Ok, the unshare part might be slight
overkill, but maybe a little better in style. Not sure though, and it
is high level whining...

-Stefan

>  Makefile                 | 2 +-
>  testsuite/Makefile       | 3 +++
>  testsuite/tools/Makefile | 3 +++
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 651d2a50..ea2f797c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -96,7 +96,7 @@ snapshot:
>               > include/SNAPSHOT.h
>  
>  clean:
> -     @for i in $(SUBDIRS); \
> +     @for i in $(SUBDIRS) testsuite; \
>       do $(MAKE) $(MFLAGS) -C $$i clean; done
>  
>  clobber:
> diff --git a/testsuite/Makefile b/testsuite/Makefile
> index 8fcbc557..2acd0427 100644
> --- a/testsuite/Makefile
> +++ b/testsuite/Makefile
> @@ -43,6 +43,9 @@ alltests: $(TESTS)
>  clean:
>       @echo "Removing $(RESULTS_DIR) dir ..."
>       @rm -rf $(RESULTS_DIR)
> +     @rm -f iproute2/iproute2-this
> +     @rm -f tests/ip/link/dev_wo_vf_rate.nl
> +     $(MAKE) -C tools clean
>  
>  distclean: clean
>       echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..;
> diff --git a/testsuite/tools/Makefile b/testsuite/tools/Makefile
> index f2cdc980..f0ce4ee2 100644
> --- a/testsuite/tools/Makefile
> +++ b/testsuite/tools/Makefile
> @@ -1,3 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  generate_nlmsg: generate_nlmsg.c ../../lib/libnetlink.c
>       $(CC) -o $@ $^
> +
> +clean:
> +     rm -f generate_nlmsg
> 


Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to