[LTP] [PATCH] cleanup: avoid to generate many redundant obj files

Yang Xu xuyang_jy_0410@163.com
Tue Feb 18 15:05:17 CET 2020


Hi Li

This patch looks good to me, feel free to add
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>

Also, I think we can replace GPL with SPDX-License-Identifier in these makefiles(Also for
all ltp makefiles, we have converted SPDX-License-Identifier in few header since commit b288957a88b1 ).

Best Regard
Yang Xu

> Signed-off-by: Li Wang <liwang@redhat.com>
> ---
>
> Notes:
>      Travis: https://travis-ci.com/wangli5665/ltp/builds/149424324
>
>   testcases/kernel/fs/ftest/Makefile               | 2 +-
>   testcases/kernel/input/Makefile                  | 2 +-
>   testcases/kernel/io/direct_io/Makefile           | 2 +-
>   testcases/kernel/sched/clisrv/Makefile           | 2 +-
>   testcases/kernel/sched/sched_stress/Makefile     | 2 +-
>   testcases/kernel/syscalls/memfd_create/Makefile  | 2 +-
>   testcases/kernel/syscalls/migrate_pages/Makefile | 2 +-
>   testcases/kernel/syscalls/move_pages/Makefile    | 2 +-
>   testcases/kernel/syscalls/swapoff/Makefile       | 2 +-
>   testcases/kernel/syscalls/swapon/Makefile        | 2 +-
>   testcases/network/nfs/nfslock01/Makefile         | 2 +-
>   testcases/network/stress/ns-tools/Makefile       | 2 +-
>   12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/testcases/kernel/fs/ftest/Makefile b/testcases/kernel/fs/ftest/Makefile
> index 1566c5c31..e5672d5b1 100644
> --- a/testcases/kernel/fs/ftest/Makefile
> +++ b/testcases/kernel/fs/ftest/Makefile
> @@ -28,4 +28,4 @@ FILTER_OUT_MAKE_TARGETS		:= libftest
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o libftest.o
> +$(MAKE_TARGETS): %: libftest.o
> diff --git a/testcases/kernel/input/Makefile b/testcases/kernel/input/Makefile
> index 5f1db9328..f4d35ab39 100644
> --- a/testcases/kernel/input/Makefile
> +++ b/testcases/kernel/input/Makefile
> @@ -24,4 +24,4 @@ FILTER_OUT_MAKE_TARGETS		:= input_helper
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o input_helper.o
> +$(MAKE_TARGETS): %: input_helper.o
> diff --git a/testcases/kernel/io/direct_io/Makefile b/testcases/kernel/io/direct_io/Makefile
> index b522136ca..6d26a7ff3 100644
> --- a/testcases/kernel/io/direct_io/Makefile
> +++ b/testcases/kernel/io/direct_io/Makefile
> @@ -30,4 +30,4 @@ INSTALL_TARGETS			:= test_dma_thread_diotest7.sh
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o diotest_routines.o
> +$(MAKE_TARGETS): %: diotest_routines.o
> diff --git a/testcases/kernel/sched/clisrv/Makefile b/testcases/kernel/sched/clisrv/Makefile
> index af43b7efd..3e311b65b 100644
> --- a/testcases/kernel/sched/clisrv/Makefile
> +++ b/testcases/kernel/sched/clisrv/Makefile
> @@ -31,6 +31,6 @@ INSTALL_TARGETS		:= data run_sched_cliserv.sh
>   
>   MAKE_TARGETS		:= pthcli pthserv
>   
> -$(MAKE_TARGETS): %: %.o readline.o writen.o
> +$(MAKE_TARGETS): %: readline.o writen.o
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/sched/sched_stress/Makefile b/testcases/kernel/sched/sched_stress/Makefile
> index 60bdc6936..2303f6950 100644
> --- a/testcases/kernel/sched/sched_stress/Makefile
> +++ b/testcases/kernel/sched/sched_stress/Makefile
> @@ -32,7 +32,7 @@ MAKE_TARGETS		:= $(filter-out sched,$(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(
>   
>   RM			+= -r
>   
> -$(filter-out sched_datafile,$(MAKE_TARGETS)): %: %.o sched.o
> +$(filter-out sched_datafile,$(MAKE_TARGETS)): %: sched.o
>   
>   MAKE_TARGETS		+= sched_datafile
>   
> diff --git a/testcases/kernel/syscalls/memfd_create/Makefile b/testcases/kernel/syscalls/memfd_create/Makefile
> index f23b8732c..40ccf7f7f 100644
> --- a/testcases/kernel/syscalls/memfd_create/Makefile
> +++ b/testcases/kernel/syscalls/memfd_create/Makefile
> @@ -20,4 +20,4 @@ FILTER_OUT_MAKE_TARGETS         := memfd_create_common
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o memfd_create_common.o
> +$(MAKE_TARGETS): %: memfd_create_common.o
> diff --git a/testcases/kernel/syscalls/migrate_pages/Makefile b/testcases/kernel/syscalls/migrate_pages/Makefile
> index 46a35d3e0..55174f3b8 100644
> --- a/testcases/kernel/syscalls/migrate_pages/Makefile
> +++ b/testcases/kernel/syscalls/migrate_pages/Makefile
> @@ -21,7 +21,7 @@ top_srcdir		?= ../../../..
>   include $(top_srcdir)/include/mk/testcases.mk
>   
>   MAKE_TARGETS		:= $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c))
> -$(MAKE_TARGETS): %: %.o migrate_pages_common.o
> +$(MAKE_TARGETS): %: migrate_pages_common.o
>   
>   CPPFLAGS		+= -I$(abs_srcdir)/../utils/
>   
> diff --git a/testcases/kernel/syscalls/move_pages/Makefile b/testcases/kernel/syscalls/move_pages/Makefile
> index 27cf0f7a8..96ff7368f 100644
> --- a/testcases/kernel/syscalls/move_pages/Makefile
> +++ b/testcases/kernel/syscalls/move_pages/Makefile
> @@ -24,7 +24,7 @@ CPPFLAGS		+= -I$(abs_srcdir)/../utils
>   
>   MAKE_TARGETS		:= $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c))
>   
> -$(MAKE_TARGETS): %: %.o move_pages_support.o
> +$(MAKE_TARGETS): %: move_pages_support.o
>   
>   LDLIBS			+= -lpthread -lrt
>   
> diff --git a/testcases/kernel/syscalls/swapoff/Makefile b/testcases/kernel/syscalls/swapoff/Makefile
> index 536b2dbac..790a2a74e 100644
> --- a/testcases/kernel/syscalls/swapoff/Makefile
> +++ b/testcases/kernel/syscalls/swapoff/Makefile
> @@ -21,4 +21,4 @@ top_srcdir		?= ../../../..
>   include $(top_srcdir)/include/mk/testcases.mk
>   include $(abs_srcdir)/./Makefile.inc
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
> -$(MAKE_TARGETS): %: %.o ../swapon/libswapon.o
> +$(MAKE_TARGETS): %: ../swapon/libswapon.o
> diff --git a/testcases/kernel/syscalls/swapon/Makefile b/testcases/kernel/syscalls/swapon/Makefile
> index a109ecdf8..a9bd8f19f 100644
> --- a/testcases/kernel/syscalls/swapon/Makefile
> +++ b/testcases/kernel/syscalls/swapon/Makefile
> @@ -29,4 +29,4 @@ FILTER_OUT_MAKE_TARGETS         := libswapon
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o libswapon.o
> +$(MAKE_TARGETS): %: libswapon.o
> diff --git a/testcases/network/nfs/nfslock01/Makefile b/testcases/network/nfs/nfslock01/Makefile
> index a07a99ea9..978749a81 100644
> --- a/testcases/network/nfs/nfslock01/Makefile
> +++ b/testcases/network/nfs/nfslock01/Makefile
> @@ -12,4 +12,4 @@ INSTALL_TARGETS			:= nfslock01
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o nfs_flock_func.o
> +$(MAKE_TARGETS): %: nfs_flock_func.o
> diff --git a/testcases/network/stress/ns-tools/Makefile b/testcases/network/stress/ns-tools/Makefile
> index 49a05232f..a288066c8 100644
> --- a/testcases/network/stress/ns-tools/Makefile
> +++ b/testcases/network/stress/ns-tools/Makefile
> @@ -35,4 +35,4 @@ FILTER_OUT_MAKE_TARGETS	:= ns-common
>   
>   include $(top_srcdir)/include/mk/generic_leaf_target.mk
>   
> -$(MAKE_TARGETS): %: %.o ns-common.o
> +$(MAKE_TARGETS): %: ns-common.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200218/08049e76/attachment.htm>


More information about the ltp mailing list