Skip to content

Commit f096962

Browse files
nasastrympe
authored andcommitted
selftests/powerpc/papr_vpd: Check 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, the expected behaviour is a SKIP. Change the order of 'SKIP_IF_MSG' to correctly SKIP when the /dev/ papr-vpd device is not available. Test output before: Test FAILED on line 271 Test output after: [SKIP] Test skipped on line 266: /dev/papr-vpd not present Signed-off-by: R Nageswara Sastry <rnsastry@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240131130859.14968-1-rnsastry@linux.ibm.com
1 parent aad98ef commit f096962

File tree

1 file changed

+2
-2
lines changed
  • tools/testing/selftests/powerpc/papr_vpd

1 file changed

+2
-2
lines changed

tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ static int papr_vpd_system_loc_code(void)
263263
off_t size;
264264
int fd;
265265

266-
SKIP_IF_MSG(get_system_loc_code(&lc),
267-
"Cannot determine system location code");
268266
SKIP_IF_MSG(devfd < 0 && errno == ENOENT,
269267
DEVPATH " not present");
268+
SKIP_IF_MSG(get_system_loc_code(&lc),
269+
"Cannot determine system location code");
270270

271271
FAIL_IF(devfd < 0);
272272

0 commit comments

Comments
 (0)