| Message ID | 20250417124529.11391-1-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4dcf407d7a4e67aea6a23eefc2e72ff9aff8fa94 |
| Headers | show |
| Series | [1/1] selftests/pcie_bwctrl: Fix test progs list | expand |
On Thu, Apr 17, 2025 at 03:45:29PM +0300, Ilpo Järvinen wrote: > The commit df6f8c4d72ae ("selftests/pcie_bwctrl: Add > 'set_pcie_speed.sh' to TEST_PROGS") added set_pcie_speed.sh into > TEST_PROGS but that script is a helper that is only being called by > set_pcie_cooling_state.sh, not a test case itself. When > set_pcie_speed.sh is in TEST_PROGS, selftest harness will execute also > it leading to bwctrl selftest errors: > > # selftests: pcie_bwctrl: set_pcie_speed.sh > # cat: /cur_state: No such file or directory > not ok 2 selftests: pcie_bwctrl: set_pcie_speed.sh # exit=1 > > Place set_pcie_speed.sh into TEST_FILES instead to have it included > into installed test files but not execute it from the test harness. > > Fixes: df6f8c4d72ae ("selftests/pcie_bwctrl: Add 'set_pcie_speed.sh' to TEST_PROGS") > Cc: stable@vger.kernel.org > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Applied to pci/for-linus for v6.15, thanks, Ilpo! > --- > > I'm sorry I didn't realize this while the fix was submitted, I'm not that > familiar with all the kselftest harness variables and the justification > given for the fix sounded valid enough to raise any alarm bells in my > mind that something would be off with the approach the fix patch used. > > tools/testing/selftests/pcie_bwctrl/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/pcie_bwctrl/Makefile b/tools/testing/selftests/pcie_bwctrl/Makefile > index 48ec048f47af..277f92f9d753 100644 > --- a/tools/testing/selftests/pcie_bwctrl/Makefile > +++ b/tools/testing/selftests/pcie_bwctrl/Makefile > @@ -1,2 +1,3 @@ > -TEST_PROGS = set_pcie_cooling_state.sh set_pcie_speed.sh > +TEST_PROGS = set_pcie_cooling_state.sh > +TEST_FILES = set_pcie_speed.sh > include ../lib.mk > > base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8 > -- > 2.39.5 >
diff --git a/tools/testing/selftests/pcie_bwctrl/Makefile b/tools/testing/selftests/pcie_bwctrl/Makefile index 48ec048f47af..277f92f9d753 100644 --- a/tools/testing/selftests/pcie_bwctrl/Makefile +++ b/tools/testing/selftests/pcie_bwctrl/Makefile @@ -1,2 +1,3 @@ -TEST_PROGS = set_pcie_cooling_state.sh set_pcie_speed.sh +TEST_PROGS = set_pcie_cooling_state.sh +TEST_FILES = set_pcie_speed.sh include ../lib.mk
The commit df6f8c4d72ae ("selftests/pcie_bwctrl: Add 'set_pcie_speed.sh' to TEST_PROGS") added set_pcie_speed.sh into TEST_PROGS but that script is a helper that is only being called by set_pcie_cooling_state.sh, not a test case itself. When set_pcie_speed.sh is in TEST_PROGS, selftest harness will execute also it leading to bwctrl selftest errors: # selftests: pcie_bwctrl: set_pcie_speed.sh # cat: /cur_state: No such file or directory not ok 2 selftests: pcie_bwctrl: set_pcie_speed.sh # exit=1 Place set_pcie_speed.sh into TEST_FILES instead to have it included into installed test files but not execute it from the test harness. Fixes: df6f8c4d72ae ("selftests/pcie_bwctrl: Add 'set_pcie_speed.sh' to TEST_PROGS") Cc: stable@vger.kernel.org Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- I'm sorry I didn't realize this while the fix was submitted, I'm not that familiar with all the kselftest harness variables and the justification given for the fix sounded valid enough to raise any alarm bells in my mind that something would be off with the approach the fix patch used. tools/testing/selftests/pcie_bwctrl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8