]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/powerpc/papr_vpd: Check devfd before get_system_loc_code()
authorR Nageswara Sastry <rnsastry@linux.ibm.com>
Wed, 31 Jan 2024 13:08:59 +0000 (18:38 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 5 Feb 2024 11:47:31 +0000 (22:47 +1100)
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
tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c

index 98cbb9109ee6e8e1e6047c1640c8cb0f4a2b5625..505294da1b9fb5e7bd07aac4a119164900c8f2e6 100644 (file)
@@ -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);