tests: use sprintrc in tests of fcntl and fcntl64 syscalls

* tests/struct_flock.c (EINVAL_STR): Remove.
(test_flock_einval, test_flock): Use sprintrc instead of EINVAL_STR.
* tests/fcntl.c (test_flock64_einval): Likewise.
* tests/fcntl64.c (test_flock64_einval, test_flock64): Likewise.

diff --git a/tests/fcntl.c b/tests/fcntl.c
index f060cdf8f4725e8f18c647e0500cc9542f719928..9e8dd24b5da56e0e62d93a59f4b221dda0dad2d4 100644 (file)
--- a/tests/fcntl.c
+++ b/tests/fcntl.c
@@ -44,9 +44,9 @@ test_flock64_einval(const int cmd, const char *name)
                .l_start = 0xdefaced1facefeedULL,
                .l_len = 0xdefaced2cafef00dULL
        };
-       invoke_test_syscall(cmd, &fl);
+       long rc = invoke_test_syscall(cmd, &fl);
        printf("%s(0, %s, %p) = %s\n",
-              TEST_SYSCALL_STR, name, &fl, EINVAL_STR);
+              TEST_SYSCALL_STR, name, &fl, sprintrc(rc));
 }
 
 static void

diff --git a/tests/fcntl64.c b/tests/fcntl64.c
index 5ecd6eb98f874f8bf888dbb1bba12f0e58e28bb1..d1511547721be02171cb9358f604d5b061873531 100644 (file)
--- a/tests/fcntl64.c
+++ b/tests/fcntl64.c
@@ -44,10 +44,10 @@ test_flock64_einval(const int cmd, const char *name)
                .l_start = 0xdefaced1facefeedULL,
                .l_len = 0xdefaced2cafef00dULL
        };
-       invoke_test_syscall(cmd, &fl);
+       long rc = invoke_test_syscall(cmd, &fl);
        printf("%s(0, %s, {l_type=F_RDLCK, l_whence=SEEK_SET"
               ", l_start=%jd, l_len=%jd}) = %s\n", TEST_SYSCALL_STR, name,
-              (intmax_t) fl.l_start, (intmax_t) fl.l_len, EINVAL_STR);
+              (intmax_t) fl.l_start, (intmax_t) fl.l_len, sprintrc(rc));
 }
 
 static void
@@ -67,7 +67,7 @@ test_flock64(void)
        long rc = invoke_test_syscall(F_SETLK64, &fl);
        printf("%s(0, F_SETLK64, {l_type=F_RDLCK, l_whence=SEEK_SET"
               ", l_start=0, l_len=%d}) = %s\n",
-              TEST_SYSCALL_STR, FILE_LEN, rc ? EINVAL_STR : "0");
+              TEST_SYSCALL_STR, FILE_LEN, sprintrc(rc));
 
        if (rc)
                return;

diff --git a/tests/struct_flock.c b/tests/struct_flock.c
index 34cf58e6b43f38477d71be576476106c396f519c..bebd9d201e387f954e21a0af9a5028b4d437b8cf 100644 (file)
--- a/tests/struct_flock.c
+++ b/tests/struct_flock.c
@@ -32,7 +32,6 @@
 #include "flock.h"
 
 #define FILE_LEN 4096
-#define EINVAL_STR "-1 EINVAL (Invalid argument)"
 
 #define TEST_FLOCK_EINVAL(cmd) test_flock_einval(cmd, #cmd)
 
@@ -58,10 +57,10 @@ test_flock_einval(const int cmd, const char *name)
                .l_start = (TYPEOF_FLOCK_OFF_T) 0xdefaced1facefeedULL,
                .l_len = (TYPEOF_FLOCK_OFF_T) 0xdefaced2cafef00dULL
        };
-       invoke_test_syscall(cmd, &fl);
+       long rc = invoke_test_syscall(cmd, &fl);
        printf("%s(0, %s, {l_type=F_RDLCK, l_whence=SEEK_SET"
               ", l_start=%jd, l_len=%jd}) = %s\n", TEST_SYSCALL_STR, name,
-              (intmax_t) fl.l_start, (intmax_t) fl.l_len, EINVAL_STR);
+              (intmax_t) fl.l_start, (intmax_t) fl.l_len, sprintrc(rc));
 }
 
 static void
@@ -77,7 +76,7 @@ test_flock(void)
        long rc = invoke_test_syscall(F_SETLK, &fl);
        printf("%s(0, F_SETLK, {l_type=F_RDLCK, l_whence=SEEK_SET"
               ", l_start=0, l_len=%d}) = %s\n",
-              TEST_SYSCALL_STR, FILE_LEN, rc ? EINVAL_STR : "0");
+              TEST_SYSCALL_STR, FILE_LEN, sprintrc(rc));
        if (rc)
                return;