2024-01-31 13:09:57

by R Nageswara Sastry

[permalink] [raw]
Subject: [PATCH] papr_vpd.c: calling devfd before get_system_loc_code

Calling get_system_loc_code before checking devfd and errno - fails the test
when the device is not available, expected a SKIP.
Change the order of 'SKIP_IF_MSG' correctly SKIP when the /dev/papr-vpd device
is not available.

with out patch: Test FAILED on line 271
with patch: [SKIP] Test skipped on line 266: /dev/papr-vpd not present

Signed-off-by: R Nageswara Sastry <[email protected]>
---
tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c b/tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c
index 98cbb9109ee6..505294da1b9f 100644
--- a/tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c
+++ b/tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c
@@ -263,10 +263,10 @@ static int papr_vpd_system_loc_code(void)
off_t size;
int fd;

- SKIP_IF_MSG(get_system_loc_code(&lc),
- "Cannot determine system location code");
SKIP_IF_MSG(devfd < 0 && errno == ENOENT,
DEVPATH " not present");
+ SKIP_IF_MSG(get_system_loc_code(&lc),
+ "Cannot determine system location code");

FAIL_IF(devfd < 0);

--
2.37.1 (Apple Git-137.1)



2024-02-15 13:00:46

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] papr_vpd.c: calling devfd before get_system_loc_code

On Wed, 31 Jan 2024 18:38:59 +0530, R Nageswara Sastry wrote:
> Calling get_system_loc_code before checking devfd and errno - fails the test
> when the device is not available, expected a SKIP.
> Change the order of 'SKIP_IF_MSG' correctly SKIP when the /dev/papr-vpd device
> is not available.
>
> with out patch: Test FAILED on line 271
> with patch: [SKIP] Test skipped on line 266: /dev/papr-vpd not present
>
> [...]

Applied to powerpc/fixes.

[1/1] papr_vpd.c: calling devfd before get_system_loc_code
https://git.kernel.org/powerpc/c/f09696279b5dd1770a3de2e062f1c5d1449213ff

cheers