Re: [PATCH v4 2/3] selftests: Move PCI Endpoint tests from tools/pci to Kselftests

[Niklas Cassel <cassel@kernel.org>]

On Tue, Dec 31, 2024 at 06:43:40PM +0530, Manivannan Sadhasivam wrote:
> This just moves the existing tests under tools/pci to
> tools/testing/selftests/pci_endpoint and adjusts the paths in Makefile
> accordingly. Migration to Kselftest framework will be done in subsequent
> commits.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

Why not squash this patch with the subsequent patch that actually
converts the tests to kselftests?

If you just apply this patch, then we have moved the code to
testing/selftests/ but the tests are not actually kselftests,
which doesn't really make sense IMO.


Kind regards,
Niklas


> ---
>  Documentation/PCI/endpoint/pci-test-howto.rst          |  9 +++++----
>  MAINTAINERS                                            |  2 +-
>  tools/testing/selftests/pci_endpoint/.gitignore        |  3 +++
>  tools/{pci => testing/selftests/pci_endpoint}/Build    |  0
>  tools/{pci => testing/selftests/pci_endpoint}/Makefile | 10 +++++-----
>  .../{pci => testing/selftests/pci_endpoint}/pcitest.c  |  0
>  .../{pci => testing/selftests/pci_endpoint}/pcitest.sh |  0
>  7 files changed, 14 insertions(+), 10 deletions(-)
>  create mode 100644 tools/testing/selftests/pci_endpoint/.gitignore
>  rename tools/{pci => testing/selftests/pci_endpoint}/Build (100%)
>  rename tools/{pci => testing/selftests/pci_endpoint}/Makefile (83%)
>  rename tools/{pci => testing/selftests/pci_endpoint}/pcitest.c (100%)
>  rename tools/{pci => testing/selftests/pci_endpoint}/pcitest.sh (100%)
> 
> diff --git a/Documentation/PCI/endpoint/pci-test-howto.rst b/Documentation/PCI/endpoint/pci-test-howto.rst
> index 909f770a07d6..c4ae7af50ede 100644
> --- a/Documentation/PCI/endpoint/pci-test-howto.rst
> +++ b/Documentation/PCI/endpoint/pci-test-howto.rst
> @@ -123,16 +123,17 @@ above::
>  Using Endpoint Test function Device
>  -----------------------------------
>  
> -pcitest.sh added in tools/pci/ can be used to run all the default PCI endpoint
> -tests. To compile this tool the following commands should be used::
> +pcitest.sh added in tools/testing/selftests/pci_endpoint can be used to run all
> +the default PCI endpoint tests. To compile this tool the following commands
> +should be used::
>  
>  	# cd <kernel-dir>
> -	# make -C tools/pci
> +	# make -C tools/testing/selftests/pci_endpoint
>  
>  or if you desire to compile and install in your system::
>  
>  	# cd <kernel-dir>
> -	# make -C tools/pci install
> +	# make -C tools/testing/selftests/pci_endpoint install
>  
>  The tool and script will be located in <rootfs>/usr/bin/
>  
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1e930c7a58b1..0e611b845d50 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -18003,7 +18003,7 @@ F:	Documentation/PCI/endpoint/*
>  F:	Documentation/misc-devices/pci-endpoint-test.rst
>  F:	drivers/misc/pci_endpoint_test.c
>  F:	drivers/pci/endpoint/
> -F:	tools/pci/
> +F:	tools/testing/selftests/pci_endpoint/
>  
>  PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
>  M:	Mahesh J Salgaonkar <mahesh@linux.ibm.com>
> diff --git a/tools/testing/selftests/pci_endpoint/.gitignore b/tools/testing/selftests/pci_endpoint/.gitignore
> new file mode 100644
> index 000000000000..29ab47c48484
> --- /dev/null
> +++ b/tools/testing/selftests/pci_endpoint/.gitignore
> @@ -0,0 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +*.o
> +pcitest
> diff --git a/tools/pci/Build b/tools/testing/selftests/pci_endpoint/Build
> similarity index 100%
> rename from tools/pci/Build
> rename to tools/testing/selftests/pci_endpoint/Build
> diff --git a/tools/pci/Makefile b/tools/testing/selftests/pci_endpoint/Makefile
> similarity index 83%
> rename from tools/pci/Makefile
> rename to tools/testing/selftests/pci_endpoint/Makefile
> index 62d41f1a1e2c..3c6fe18e32cc 100644
> --- a/tools/pci/Makefile
> +++ b/tools/testing/selftests/pci_endpoint/Makefile
> @@ -1,11 +1,10 @@
>  # SPDX-License-Identifier: GPL-2.0
> -include ../scripts/Makefile.include
> +include ../../../scripts/Makefile.include
>  
>  bindir ?= /usr/bin
>  
>  ifeq ($(srctree),)
> -srctree := $(patsubst %/,%,$(dir $(CURDIR)))
> -srctree := $(patsubst %/,%,$(dir $(srctree)))
> +srctree := $(patsubst %/tools/testing/selftests/,%,$(dir $(CURDIR)))
>  endif
>  
>  # Do not use make's built-in rules
> @@ -27,10 +26,11 @@ include $(srctree)/tools/build/Makefile.include
>  #
>  # We need the following to be outside of kernel tree
>  #
> -$(OUTPUT)include/linux/: ../../include/uapi/linux/
> +$(OUTPUT)include/linux/: ../../../../include/uapi/linux/
>  	mkdir -p $(OUTPUT)include/linux/ 2>&1 || true
> -	ln -sf $(CURDIR)/../../include/uapi/linux/pcitest.h $@
> +	ln -sf $(CURDIR)/../../../../include/uapi/linux/pcitest.h $@
>  
> +$(info ${CURDIR})
>  prepare: $(OUTPUT)include/linux/
>  
>  PCITEST_IN := $(OUTPUT)pcitest-in.o
> diff --git a/tools/pci/pcitest.c b/tools/testing/selftests/pci_endpoint/pcitest.c
> similarity index 100%
> rename from tools/pci/pcitest.c
> rename to tools/testing/selftests/pci_endpoint/pcitest.c
> diff --git a/tools/pci/pcitest.sh b/tools/testing/selftests/pci_endpoint/pcitest.sh
> similarity index 100%
> rename from tools/pci/pcitest.sh
> rename to tools/testing/selftests/pci_endpoint/pcitest.sh
> -- 
> 2.25.1
>