[PATCH v2] selftest: hid: add the missing tests directory

Yun Lu posted 1 patch 1 month, 1 week ago
tools/testing/selftests/hid/Makefile | 1 +
1 file changed, 1 insertion(+)
[PATCH v2] selftest: hid: add the missing tests directory
Posted by Yun Lu 1 month, 1 week ago
Commit 160c826b4dd0 ("selftest: hid: add missing run-hid-tools-tests.sh")
has added the run-hid-tools-tests.sh script for it to be installed, but
I forgot to add the tests directory together.

If running the test case without the tests directory,  will results in
the following error message:

    make -C tools/testing/selftests/ TARGETS=hid install \
	    INSTALL_PATH=$KSFT_INSTALL_PATH
    cd $KSFT_INSTALL_PATH
    ./run_kselftest.sh -t hid:hid-core.sh

  /usr/lib/python3.11/site-packages/_pytest/config/__init__.py:331: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown.
  Plugin: helpconfig, Hook: pytest_cmdline_parse
  UsageError: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...]
  __main__.py: error: unrecognized arguments: --udevd
    inifile: None
    rootdir: /root/linux/kselftest_install/hid

In fact, the run-hid-tools-tests.sh script uses the scripts in the tests
directory to run tests. The tests directory also needs to be added to be
installed.

v2: add the error message

Fixes: ffb85d5c9e80 ("selftests: hid: import hid-tools hid-core tests")
Cc: stable@vger.kernel.org
Signed-off-by: Yun Lu <luyun@kylinos.cn>
---
 tools/testing/selftests/hid/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
index 38ae31bb07b5..662209f5fabc 100644
--- a/tools/testing/selftests/hid/Makefile
+++ b/tools/testing/selftests/hid/Makefile
@@ -18,6 +18,7 @@ TEST_PROGS += hid-usb_crash.sh
 TEST_PROGS += hid-wacom.sh
 
 TEST_FILES := run-hid-tools-tests.sh
+TEST_FILES += tests
 
 CXX ?= $(CROSS_COMPILE)g++
 
-- 
2.27.0
Re: [PATCH v2] selftest: hid: add the missing tests directory
Posted by Benjamin Tissoires 1 month, 1 week ago
On Oct 15 2024, Yun Lu wrote:
> Commit 160c826b4dd0 ("selftest: hid: add missing run-hid-tools-tests.sh")
> has added the run-hid-tools-tests.sh script for it to be installed, but
> I forgot to add the tests directory together.
> 
> If running the test case without the tests directory,  will results in
> the following error message:
> 
>     make -C tools/testing/selftests/ TARGETS=hid install \
> 	    INSTALL_PATH=$KSFT_INSTALL_PATH
>     cd $KSFT_INSTALL_PATH
>     ./run_kselftest.sh -t hid:hid-core.sh
> 
>   /usr/lib/python3.11/site-packages/_pytest/config/__init__.py:331: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown.
>   Plugin: helpconfig, Hook: pytest_cmdline_parse
>   UsageError: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...]
>   __main__.py: error: unrecognized arguments: --udevd
>     inifile: None
>     rootdir: /root/linux/kselftest_install/hid
> 
> In fact, the run-hid-tools-tests.sh script uses the scripts in the tests
> directory to run tests. The tests directory also needs to be added to be
> installed.
> 
> v2: add the error message
> 
> Fixes: ffb85d5c9e80 ("selftests: hid: import hid-tools hid-core tests")
> Cc: stable@vger.kernel.org
> Signed-off-by: Yun Lu <luyun@kylinos.cn>

Acked-by: Benjamin Tissoires <bentiss@kernel.org>

Shuah, I guess you'll want to take this one through your tree given that
you already took the run-hid-tools-tests.sh one?

Cheers,
Benjamin

> ---
>  tools/testing/selftests/hid/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
> index 38ae31bb07b5..662209f5fabc 100644
> --- a/tools/testing/selftests/hid/Makefile
> +++ b/tools/testing/selftests/hid/Makefile
> @@ -18,6 +18,7 @@ TEST_PROGS += hid-usb_crash.sh
>  TEST_PROGS += hid-wacom.sh
>  
>  TEST_FILES := run-hid-tools-tests.sh
> +TEST_FILES += tests
>  
>  CXX ?= $(CROSS_COMPILE)g++
>  
> -- 
> 2.27.0
>
Re: [PATCH v2] selftest: hid: add the missing tests directory
Posted by Shuah Khan 1 month, 1 week ago
On 10/16/24 02:27, Benjamin Tissoires wrote:
> On Oct 15 2024, Yun Lu wrote:
>> Commit 160c826b4dd0 ("selftest: hid: add missing run-hid-tools-tests.sh")
>> has added the run-hid-tools-tests.sh script for it to be installed, but
>> I forgot to add the tests directory together.
>>
>> If running the test case without the tests directory,  will results in
>> the following error message:
>>
>>      make -C tools/testing/selftests/ TARGETS=hid install \
>> 	    INSTALL_PATH=$KSFT_INSTALL_PATH
>>      cd $KSFT_INSTALL_PATH
>>      ./run_kselftest.sh -t hid:hid-core.sh
>>
>>    /usr/lib/python3.11/site-packages/_pytest/config/__init__.py:331: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown.
>>    Plugin: helpconfig, Hook: pytest_cmdline_parse
>>    UsageError: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...]
>>    __main__.py: error: unrecognized arguments: --udevd
>>      inifile: None
>>      rootdir: /root/linux/kselftest_install/hid
>>
>> In fact, the run-hid-tools-tests.sh script uses the scripts in the tests
>> directory to run tests. The tests directory also needs to be added to be
>> installed.
>>
>> v2: add the error message
>>
>> Fixes: ffb85d5c9e80 ("selftests: hid: import hid-tools hid-core tests")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Yun Lu <luyun@kylinos.cn>
> 
> Acked-by: Benjamin Tissoires <bentiss@kernel.org>
> 
> Shuah, I guess you'll want to take this one through your tree given that
> you already took the run-hid-tools-tests.sh one?
> 

Yes. I will take this one. Thanks.

thanks,
-- Shuah
Re: [PATCH v2] selftest: hid: add the missing tests directory
Posted by Shuah Khan 1 month, 1 week ago
On 10/16/24 09:08, Shuah Khan wrote:
> On 10/16/24 02:27, Benjamin Tissoires wrote:
>> On Oct 15 2024, Yun Lu wrote:
>>> Commit 160c826b4dd0 ("selftest: hid: add missing run-hid-tools-tests.sh")
>>> has added the run-hid-tools-tests.sh script for it to be installed, but
>>> I forgot to add the tests directory together.
>>>
>>> If running the test case without the tests directory,  will results in
>>> the following error message:
>>>
>>>      make -C tools/testing/selftests/ TARGETS=hid install \
>>>         INSTALL_PATH=$KSFT_INSTALL_PATH
>>>      cd $KSFT_INSTALL_PATH
>>>      ./run_kselftest.sh -t hid:hid-core.sh
>>>
>>>    /usr/lib/python3.11/site-packages/_pytest/config/__init__.py:331: PluggyTeardownRaisedWarning: A plugin raised an exception during an old-style hookwrapper teardown.
>>>    Plugin: helpconfig, Hook: pytest_cmdline_parse
>>>    UsageError: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...]
>>>    __main__.py: error: unrecognized arguments: --udevd
>>>      inifile: None
>>>      rootdir: /root/linux/kselftest_install/hid
>>>
>>> In fact, the run-hid-tools-tests.sh script uses the scripts in the tests
>>> directory to run tests. The tests directory also needs to be added to be
>>> installed.
>>>

Yun Lu,
The patch version information doesn't belong in the change log.
You have to add it below the three dashes as shown below.
Check submitting patches document for details.

---
v2: add the error message

  tools/testing/selftests/hid/Makefile | 1 +
  1 file changed, 1 insertion(+)

There is no need to send another version. I fixed
it up.

>>> v2: add the error message
>>>
>>> Fixes: ffb85d5c9e80 ("selftests: hid: import hid-tools hid-core tests")
>>> Cc: stable@vger.kernel.org
>>> Signed-off-by: Yun Lu <luyun@kylinos.cn>
>>
>> Acked-by: Benjamin Tissoires <bentiss@kernel.org>

Thank you.

>>
>> Shuah, I guess you'll want to take this one through your tree given that
>> you already took the run-hid-tools-tests.sh one?
>>
> 
> Yes. I will take this one. Thanks.
> 

Thanks for the patch. Applied to linux-kselftest fixes for next rc.

thanks,
-- Shuah